In one target we weren't always creating the $libexecdir

($prefix/modules) directory, and in another we were assuming that the
directory existed. Now we always create it in the first target, and we
check that it exists in the second.

This fixes a bug where httpd.exp would be installed as a _file_ called
$prefix/modules.

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

diff --git a/build/special.mk b/build/special.mk
index 2f27aa6508441562aeeabbf886eb3a5e68c93aef..cb3e8d1662bbbd66edd2e6cdab1ea88808b67a26 100644 (file)
--- a/build/special.mk
+++ b/build/special.mk
@@ -62,10 +62,10 @@ SHARED_TARGETS = $(shared)
 INSTALL_TARGETS = install-modules
 
 install-modules:
+       @test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir);
        @builtin='$(BUILTIN_LIBS)'; \
        has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \
        if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \
-               $(MKINSTALLDIRS) $(libexecdir); \
                list='$(shared)'; \
                for i in $$list; do \
                        $(SH_LIBTOOL) --mode=install cp $$i $(libexecdir); \

diff --git a/support/Makefile.in b/support/Makefile.in
index 20cdc156fb7b219c0e0c0d78d4da7a8f238dc6bf..7cfddfbb9a3baf66168e3367dc2de71d2b7c3fb9 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -13,6 +13,7 @@ include $(top_builddir)/build/rules.mk
 
 install:
        @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
+       @test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
        @cp -p $(top_builddir)/server/httpd.exp $(libexecdir)
        @for i in apxs apachectl dbmmanage; do \
            if test -f "$(builddir)/$$i"; then \