OS/2: fix "make install" to install shared core & programs with a .exe

extension.

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

diff --git a/Makefile.in b/Makefile.in
index ee79e7f8a8aa316c3c4360c776f8be4e11d5d3e9..14536dc9da60975e9b3bf24be500ed07cd36f0b8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,6 +83,10 @@ install-other:
                        cp -p $$file $(bindir); \
                fi; \
        done;
+       file=httpd.dll; \
+       if test -f $$file; then \
+               cp -p $$file $(bindir); \
+       fi;
 
 install-include:
        @echo Installing header files

diff --git a/acinclude.m4 b/acinclude.m4
index e412f556180a487e5777892ce3fafea27bf97c51..4fc5ec396a431c6ce1b01432f45366e010ee750e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,6 +79,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(CORE_IMPLIB)
   APACHE_SUBST(SH_LIBTOOL)
   APACHE_SUBST(MK_IMPLIB)
+  APACHE_SUBST(INSTALL_PROG_FLAGS)
 
   abs_srcdir="`(cd $srcdir && pwd)`"
 

diff --git a/build/rules.mk b/build/rules.mk
index b8a1165d9b8f16148adde81707ef82c006256b3b..367d2256ce4ca0ea5fc02a9bee3f12d49bdd4ac9 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -92,7 +92,7 @@ MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(ALL_LDFLAGS) -
 MKINSTALLDIRS = $(abs_srcdir)/build/mkdir.sh
 INSTALL = $(abs_srcdir)/build/install.sh -c
 INSTALL_DATA = $(INSTALL) -m 644
-INSTALL_PROGRAM = $(INSTALL) -m 755
+INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
 
 # Suffixes