]> granicus.if.org Git - apache/commitdiff
Fix parallel installation for static modules
authorRainer Jung <rjung@apache.org>
Wed, 1 Feb 2012 11:16:34 +0000 (11:16 +0000)
committerRainer Jung <rjung@apache.org>
Wed, 1 Feb 2012 11:16:34 +0000 (11:16 +0000)
builds. When "$(shared)" was empty, instdso.sh
complained with a Usage message.

Don't call instdso, if there's nothing to install.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239075 13f79535-47bb-0310-9956-ffa450edef68

build/special.mk

index 66c9c7c8cea29aec09a56b1e2aa05b375e60384b..53b880dd569ef6e6062fdc3b152661acafdb5cbb 100644 (file)
@@ -27,8 +27,10 @@ INSTALL_TARGETS = install-modules-$(INSTALL_DSO)
 include $(top_builddir)/build/rules.mk
 
 install-modules-yes: $(SHARED_TARGETS)
-       @$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
-       @$(top_srcdir)/build/instdso.sh SH_LIBTOOL='$(SH_LIBTOOL)' $(shared) $(DESTDIR)$(libexecdir)
+       @if test -n "$(shared)"; then \
+           $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir); \
+           $(top_srcdir)/build/instdso.sh SH_LIBTOOL='$(SH_LIBTOOL)' $(shared) $(DESTDIR)$(libexecdir); \
+       fi;
 
 install-modules-no: