From 27b9a14ca995686ccea004254a267494c48a1e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Mon, 13 Jul 2015 12:18:11 +0000
Subject: [PATCH] some bugfixes

---
 bootstrap.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index f242a57..5478146 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -490,16 +490,16 @@ EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
 to --condition AX_USE_CPPUNIT test/makefile.am <<EOF
-${HEADER}AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src
-AM_LDFLAGS = -L${top_builddir}/src/.libs
-LDADD = -l${PACKAGE_NAME}
+${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
+AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
+LDADD = -l${PACKAGE_NAME#lib}
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_BUILD_EXAMPLES examples/makefile.am <<EOF
-${HEADER}AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src
-AM_LDFLAGS = -L${top_builddir}/src/.libs
-LDADD = -l${PACKAGE_NAME}
+${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
+AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
+LDADD = -l${PACKAGE_NAME#lib}
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
@@ -657,7 +657,7 @@ includedir=\${prefix}/include
 Name: @PACKAGE_NAME@
 Description: @DESCRIPTION@
 Version: @VERSION@
-Libs: -L\${libdir} -l@PACKAGE_NAME@ @LDFLAGS@
+Libs: -L\${libdir} -l${PACKAGE_NAME#lib} @LDFLAGS@
 Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF