Merge platform-specific packaging changes back to trunk. Closes #377,

#374, #395, #398.  Also see #373, which ended up not being covered by
this branch after all.

svn path=/trunk/; revision=5065

7 files changed, 7 insertions, 20 deletions

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 7f59f132..11c8d17b 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -2,7 +2,7 @@
 
 SUBDIRS = uri print_rpki_manifest print_roa hashdir find_roa scan_roas
 
-all clean test distclean install deinstall uninstall installation-manifest::
+all clean test distclean install deinstall uninstall::
 	@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
 
 distclean::
diff --git a/utils/find_roa/Makefile.in b/utils/find_roa/Makefile.in
index 438071d9..36c68e01 100644
--- a/utils/find_roa/Makefile.in
+++ b/utils/find_roa/Makefile.in
@@ -36,11 +36,13 @@ ${BIN}: ${SRC}
 	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} ${LIBS}
 
 
-TEST_ARGS = ${abs_top_builddir}/rcynic/rcynic-data/authenticated 10.3.0.44 10.2.0.6 10.0.0.0/24
+ROA_DIR = ${abs_top_builddir}/rcynic/rcynic-data/authenticated
+
+TEST_ARGS = ${ROA_DIR} 10.3.0.44 10.2.0.6 10.0.0.0/24
 
 test: ${BIN}
-#	./${BIN} ${TEST_ARGS}
-	sh ./test_roa.sh ${TEST_ARGS}
+#	if test -d ${ROA_DIR}; then ./${BIN} ${TEST_ARGS} ; else :; fi
+	if test -d ${ROA_DIR}; then sh ./test_roa.sh ${TEST_ARGS} ; else :; fi
 
 install: all
 	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
@@ -49,9 +51,6 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -rf hashed-pem-dir
 	rm -f Makefile
diff --git a/utils/hashdir/Makefile.in b/utils/hashdir/Makefile.in
index 66b2cc25..c0cf448a 100644
--- a/utils/hashdir/Makefile.in
+++ b/utils/hashdir/Makefile.in
@@ -48,9 +48,6 @@ install: all
 	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
 	${INSTALL} ${BIN} ${DESTDIR}${bindir}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in
index 9bb83bc2..5999b351 100644
--- a/utils/print_roa/Makefile.in
+++ b/utils/print_roa/Makefile.in
@@ -48,8 +48,5 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -f Makefile
diff --git a/utils/print_rpki_manifest/Makefile.in b/utils/print_rpki_manifest/Makefile.in
index 513afa34..22f1b16b 100644
--- a/utils/print_rpki_manifest/Makefile.in
+++ b/utils/print_rpki_manifest/Makefile.in
@@ -48,8 +48,5 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -f Makefile
diff --git a/utils/scan_roas/Makefile.in b/utils/scan_roas/Makefile.in
index f61ebd3c..3d86532d 100644
--- a/utils/scan_roas/Makefile.in
+++ b/utils/scan_roas/Makefile.in
@@ -48,8 +48,5 @@ install: all
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
-installation-manifest:
-	echo >>${abs_top_builddir}/installation-manifest F %%BINDIR%%/${BIN}
-
 distclean: clean
 	rm -f Makefile
diff --git a/utils/uri/Makefile.in b/utils/uri/Makefile.in
index 79ffe3d0..fc545060 100644
--- a/utils/uri/Makefile.in
+++ b/utils/uri/Makefile.in
@@ -24,7 +24,7 @@ ${BIN}: ${SRC}
 test:
 	@true
 
-install deinstall uninstall installation-manifest:
+install deinstall uninstall:
 	@true
 
 distclean: clean