Install directories, using $(INSTALL) -d, only if

they don't exist already.

Rev: src/nettle/ChangeLog:1.317
Rev: src/nettle/Makefile.in:1.20

diff --git a/ChangeLog b/ChangeLog
index 288304b7032412bffe05e4c804b8560f06964054..056d5d5726916a2b6b6e7b9d56fe62839639dd43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Niels Möller  <nisse@lysator.liu.se>
+
+       * Makefile.in: Install directories, using $(INSTALL) -d, only if
+       they don't exist already.
+
 2004-12-05  Niels Möller  <nisse@lysator.liu.se>
 
        * config.make.in (.PRECIOUS): Reverted earlier change. We need

diff --git a/Makefile.in b/Makefile.in
index f4383722a0bef49f457efa8e5cd8538264aaba4f..3dcd6cd7b62402bc615b3e9f60f3dac07a34aa68 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -202,11 +202,11 @@ config.m4: config.m4.in config.status
 
 # Installation
 install-here: install-info install-headers libnettle.a $(SHLIBINSTALL)
-       $(INSTALL) -d $(DESTDIR)$(libdir)
+       [ -d $(DESTDIR)$(libdir) ] || $(INSTALL) -d $(DESTDIR)$(libdir)
        $(INSTALL_DATA) libnettle.a $(DESTDIR)$(libdir)
 
 install-shared: $(SHLIBFORLINK)
-       $(INSTALL) -d $(DESTDIR)$(libdir)
+       [ -d $(DESTDIR)$(libdir) ] || $(INSTALL) -d $(DESTDIR)$(libdir)
        $(INSTALL_PROGRAM) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE)
        [ -z "$(SHLIBSONAME)" ] \
                 || (cd $(DESTDIR)$(libdir) \
@@ -214,7 +214,7 @@ install-shared: $(SHLIBFORLINK)
                && ln -sf $(SHLIBFILE) $(SHLIBFORLINK) )
 
 install-info: nettle.info
-       $(INSTALL) -d $(DESTDIR)$(infodir)
+       [ -d $(DESTDIR)$(infodir) ] || $(INSTALL) -d $(DESTDIR)$(infodir)
        $(INSTALL_DATA) $< $(DESTDIR)$(infodir)
        if (install-info --version && \
            install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
@@ -224,7 +224,8 @@ install-info: nettle.info
 # NOTE: I'd like to use $^, but that's a GNU extension. $? should be
 # more portable, and equivalent for phony targets.
 install-headers: $(INSTALL_HEADERS)
-       $(INSTALL) -d $(DESTDIR)$(includedir)/nettle
+       [ -d $(DESTDIR)$(includedir) ] || $(INSTALL) -d $(DESTDIR)$(includedir)
+       [ -d $(DESTDIR)$(includedir)/nettle ] || $(INSTALL) -d $(DESTDIR)$(includedir)/nettle
        $(INSTALL_DATA) $? $(DESTDIR)$(includedir)/nettle
 
 # Uninstall