Commit b4bb9c9b authored by Aaron Bannert's avatar Aaron Bannert
Browse files

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
parent 589f7215

build/special.mk

+1 −1
Original line number Diff line number Diff line
@@ -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); \

support/Makefile.in

+1 −0
Original line number Diff line number Diff line
@@ -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 \