From 47e8fee91bef404c1528bc6e4c580f08f4d73c69 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sun, 30 Sep 2012 16:19:41 +0000
Subject: Don't whack installation directories if they already exist.  Maybe
 there's some clever way to autoconf this so users can control whether they
 want their directories whacked or not, but for now we need to stop doing this
 because it messes up /usr/local on MacOSX laptops. See #288.

svn path=/branches/tk274/; revision=4745
---
 utils/find_roa/Makefile.in            | 2 +-
 utils/hashdir/Makefile.in             | 2 +-
 utils/print_roa/Makefile.in           | 2 +-
 utils/print_rpki_manifest/Makefile.in | 2 +-
 utils/scan_roas/Makefile.in           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'utils')

diff --git a/utils/find_roa/Makefile.in b/utils/find_roa/Makefile.in
index 4d2c3139..ebb77106 100644
--- a/utils/find_roa/Makefile.in
+++ b/utils/find_roa/Makefile.in
@@ -43,7 +43,7 @@ test: ${BIN}
 	sh ./test_roa.sh ${TEST_ARGS}
 
 install: all
-	${INSTALL} -d ${DESTDIR}${bindir}
+	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
 	${INSTALL} ${BIN} ${DESTDIR}${bindir}
 
 deinstall uninstall:
diff --git a/utils/hashdir/Makefile.in b/utils/hashdir/Makefile.in
index 782561d7..c0cf448a 100644
--- a/utils/hashdir/Makefile.in
+++ b/utils/hashdir/Makefile.in
@@ -45,7 +45,7 @@ clean::
 	rm -rf ${OUTPUT}
 
 install: all
-	${INSTALL} -d ${DESTDIR}${bindir}
+	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
 	${INSTALL} ${BIN} ${DESTDIR}${bindir}
 
 deinstall uninstall:
diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in
index bbe01a1f..5999b351 100644
--- a/utils/print_roa/Makefile.in
+++ b/utils/print_roa/Makefile.in
@@ -42,7 +42,7 @@ test: all
 	if test -d ${ROA_DIR}; then find ${ROA_DIR} -type f -name '*.roa' -print -exec ./${BIN} {} \; ; else :; fi
 
 install: all
-	${INSTALL} -d ${DESTDIR}${bindir}
+	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
 	${INSTALL} ${BIN} ${DESTDIR}${bindir}
 
 deinstall uninstall:
diff --git a/utils/print_rpki_manifest/Makefile.in b/utils/print_rpki_manifest/Makefile.in
index 8a525891..22f1b16b 100644
--- a/utils/print_rpki_manifest/Makefile.in
+++ b/utils/print_rpki_manifest/Makefile.in
@@ -42,7 +42,7 @@ test: all
 	if test -d ${MANIFEST_DIR}; then find ${MANIFEST_DIR} -type f -name '*.mnf' -print -exec ./${BIN} {} \; ; else :; fi
 
 install: all
-	${INSTALL} -d ${DESTDIR}${bindir}
+	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
 	${INSTALL} ${BIN} ${DESTDIR}${bindir}
 
 deinstall uninstall:
diff --git a/utils/scan_roas/Makefile.in b/utils/scan_roas/Makefile.in
index 39936994..3d86532d 100644
--- a/utils/scan_roas/Makefile.in
+++ b/utils/scan_roas/Makefile.in
@@ -42,7 +42,7 @@ test: all
 	if test -d ${ROA_DIR}; then find ${ROA_DIR} -type f -name '*.roa' -print -exec ./${BIN} {} \; ; else :; fi
 
 install: all
-	${INSTALL} -d ${DESTDIR}${bindir}
+	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
 	${INSTALL} ${BIN} ${DESTDIR}${bindir}
 
 deinstall uninstall:
-- 
cgit v1.2.3