From 8abf77a1f93f4a916be07c4025060ebfe55c1e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Tue, 7 Dec 2004 23:47:11 +0100
Subject: [PATCH] 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
---
ChangeLog | 5 +++++
Makefile.in | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 288304b7..056d5d57 100644
--- 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 f4383722..3dcd6cd7 100644
--- 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
--
GitLab