* Makefile.in (install-build): Install mkdir.sh since it's used by the

installed special.mk now; install instdso.sh as 0755.

* support/apxs.in: Fix Makefile template created by -g.

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

diff --git a/Makefile.in b/Makefile.in
index b0ef7622dd2ff1988519f146c3970650697b8c29..b7f2b7227bfb1b20dcecdd2cbf6e984c6ca107da 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,9 +89,11 @@ install-build:
        @echo Installing build system files 
        @$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
        @for f in $(top_srcdir)/build/*.mk build/*.mk \
-                 $(top_srcdir)/build/instdso.sh $(top_builddir)/config.nice; do \
+                 $(top_builddir)/config.nice; do \
         $(INSTALL_DATA) $$f $(DESTDIR)$(installbuilddir); \
        done
+       @(INSTALL_PROGRAM) $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
+       @(INSTALL_PROGRAM) $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir)
        @sed "/^LIBTOOL/s#/[^ ]*/libtool \(.*\)#`$(APR_CONFIG) --apr-libtool` $(LTFLAGS)#" \
            build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk
 

diff --git a/support/apxs.in b/support/apxs.in
index f1a5a3c900c64d60fcaff1a285ec0526d5b2c300..7b5316fad6f47c4617d8bc38230166f2fdd43413 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -662,7 +662,7 @@ APACHECTL=apachectl
 all: local-shared-build
 
 #   install the shared object file into Apache 
-install: install-modules
+install: install-modules-yes
 
 #   cleanup
 clean: