fix autoconf/build for some systems (works on Ubuntu 8.04 LTS now)

opendnssec · Jul 7, 2009 · 5e8ebff · 5e8ebff
1 parent 29857cc
commit 5e8ebff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -18,6 +18,6 @@ install-data-hook:
 	test -d ${sysconfdir} || \
 		${INSTALL} -d ${sysconfdir}
 	test -f ${sysconfdir}/softhsm.conf || \
-		${INSTALL_DATA} ${builddir}/softhsm.conf ${sysconfdir}
+		${INSTALL_DATA} ${top_builddir}/softhsm.conf ${sysconfdir}
 	test -d ${softhsmdbdir} || \
 		${INSTALL} -d -m 700 ${softhsmdbdir}
diff --git a/autogen.sh b/autogen.sh
@@ -2,7 +2,7 @@
 #
 # $Id$
 
-ACLOCAL="aclocal -I../m4"
+ACLOCAL="aclocal -I ../m4"
 export ACLOCAL
 
 autoreconf --install --force
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
@@ -3,7 +3,8 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 AM_CPPFLAGS = 		-I$(srcdir)/../lib \
-			-I$(srcdir)/../lib/cryptoki
+			-I$(srcdir)/../lib/cryptoki \
+			@BOTAN_INCLUDES@
 
 bin_PROGRAMS =		softhsm
 softhsm_SOURCES =	softhsm.cpp softhsm.h