You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2012/02/01 12:16:35 UTC
svn commit: r1239075 - /httpd/httpd/trunk/build/special.mk
Author: rjung
Date: Wed Feb 1 11:16:34 2012
New Revision: 1239075
URL: http://svn.apache.org/viewvc?rev=1239075&view=rev
Log:
Fix parallel installation for static modules
builds. When "$(shared)" was empty, instdso.sh
complained with a Usage message.
Don't call instdso, if there's nothing to install.
Modified:
httpd/httpd/trunk/build/special.mk
Modified: httpd/httpd/trunk/build/special.mk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/special.mk?rev=1239075&r1=1239074&r2=1239075&view=diff
==============================================================================
--- httpd/httpd/trunk/build/special.mk (original)
+++ httpd/httpd/trunk/build/special.mk Wed Feb 1 11:16:34 2012
@@ -27,8 +27,10 @@ INSTALL_TARGETS = install-modules-$(INST
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: