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

7 files changed, 9 insertions, 9 deletions

diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in
index d4b7c5dc..eb84d873 100644
--- a/rpkid/portal-gui/Makefile.in
+++ b/rpkid/portal-gui/Makefile.in
@@ -40,9 +40,9 @@ apache.conf: $(srcdir)/apache.conf.in Makefile
 	$(edit) $@.in > $@
 
 install: $(BUILD)
-	${INSTALL} -d $(SYSCONFDIR)
-	${INSTALL} -d $(INSTDIR)/media/css
-	${INSTALL} -d $(INSTDIR)/wsgi
+	if test -d $(SYSCONFDIR); then :; else ${INSTALL} -d $(SYSCONFDIR); fi
+	if test -d $(INSTDIR)/media/css; then :; else ${INSTALL} -d $(INSTDIR)/media/css; fi
+	if test -d $(INSTDIR)/wsgi; then :; else ${INSTALL} -d $(INSTDIR)/wsgi; fi
 	${INSTALL} -m 644 apache.conf $(SYSCONFDIR)/apache.conf
 	${INSTALL} -m 644 $(srcdir)/media/css/bootstrap.min.css $(INSTDIR)/media/css/bootstrap.min.css
 	${INSTALL} -m 644 rpki.wsgi $(INSTDIR)/wsgi/rpki.wsgi
diff --git a/rtr-origin/Makefile.in b/rtr-origin/Makefile.in
index 0f29c797..8a50e528 100644
--- a/rtr-origin/Makefile.in
+++ b/rtr-origin/Makefile.in
@@ -28,7 +28,7 @@ clean:
 	rm -f ${BIN}
 
 install: all
-	${INSTALL} -d ${DESTDIR}${bindir}
+	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
 	${INSTALL} ${BIN} ${DESTDIR}${bindir}/${BIN}
 
 deinstall uninstall:
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: