Commit 8abf77a1 authored by Niels Möller's avatar Niels Möller
Browse files

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
parent 0b64a9eb
2004-12-07 Niels Mller <nisse@lysator.liu.se>
* Makefile.in: Install directories, using $(INSTALL) -d, only if
they don't exist already.
2004-12-05 Niels Mller <nisse@lysator.liu.se> 2004-12-05 Niels Mller <nisse@lysator.liu.se>
* config.make.in (.PRECIOUS): Reverted earlier change. We need * config.make.in (.PRECIOUS): Reverted earlier change. We need
......
...@@ -202,11 +202,11 @@ config.m4: config.m4.in config.status ...@@ -202,11 +202,11 @@ config.m4: config.m4.in config.status
# Installation # Installation
install-here: install-info install-headers libnettle.a $(SHLIBINSTALL) 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_DATA) libnettle.a $(DESTDIR)$(libdir)
install-shared: $(SHLIBFORLINK) install-shared: $(SHLIBFORLINK)
$(INSTALL) -d $(DESTDIR)$(libdir) [ -d $(DESTDIR)$(libdir) ] || $(INSTALL) -d $(DESTDIR)$(libdir)
$(INSTALL_PROGRAM) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE) $(INSTALL_PROGRAM) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE)
[ -z "$(SHLIBSONAME)" ] \ [ -z "$(SHLIBSONAME)" ] \
|| (cd $(DESTDIR)$(libdir) \ || (cd $(DESTDIR)$(libdir) \
...@@ -214,7 +214,7 @@ install-shared: $(SHLIBFORLINK) ...@@ -214,7 +214,7 @@ install-shared: $(SHLIBFORLINK)
&& ln -sf $(SHLIBFILE) $(SHLIBFORLINK) ) && ln -sf $(SHLIBFILE) $(SHLIBFORLINK) )
install-info: nettle.info install-info: nettle.info
$(INSTALL) -d $(DESTDIR)$(infodir) [ -d $(DESTDIR)$(infodir) ] || $(INSTALL) -d $(DESTDIR)$(infodir)
$(INSTALL_DATA) $< $(DESTDIR)$(infodir) $(INSTALL_DATA) $< $(DESTDIR)$(infodir)
if (install-info --version && \ if (install-info --version && \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
...@@ -224,7 +224,8 @@ install-info: nettle.info ...@@ -224,7 +224,8 @@ install-info: nettle.info
# NOTE: I'd like to use $^, but that's a GNU extension. $? should be # NOTE: I'd like to use $^, but that's a GNU extension. $? should be
# more portable, and equivalent for phony targets. # more portable, and equivalent for phony targets.
install-headers: $(INSTALL_HEADERS) 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 $(INSTALL_DATA) $? $(DESTDIR)$(includedir)/nettle
# Uninstall # Uninstall
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment