From: Brian Havard <bjh@apache.org>
Date: Sun, 29 Apr 2001 08:25:52 +0000 (+0000)
Subject: OS/2: fix "make install" to install shared core & programs with a .exe
X-Git-Tag: 2.0.18~139
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=baa865bddf8a38134c67f111b5939f94bdb8665a;p=apache

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 ee79e7f8a8..14536dc9da 100644
--- 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 e412f55618..4fc5ec396a 100644
--- 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 b8a1165d9b..367d2256ce 100644
--- 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