rse 98/09/19 05:41:48
Modified: . Makefile.tmpl
Log:
Cleanup the `install' stuff:
INSTALL_SCRIPT for DSOs was confusing. Use an own define for this.
And be consistent: Don't display INSTALL_PROGRAM but do INSTALL_SCRIPT.
Revision Changes Path
1.48 +7 -6 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.tmpl 1998/09/17 14:43:24 1.47
+++ Makefile.tmpl 1998/09/19 12:41:48 1.48
@@ -83,6 +83,7 @@
MKDIR = $(TOP)/$(AUX)/mkdir.sh
INSTALL = $(TOP)/$(AUX)/install.sh -c
INSTALL_PROGRAM = $(INSTALL) -s -m 755
+INSTALL_DSO = $(INSTALL) -m 755
INSTALL_SCRIPT = $(INSTALL) -m 755
INSTALL_DATA = $(INSTALL) -m 644
PERL = @PERL@
@@ -240,10 +241,10 @@
[EMAIL PROTECTED] [ ".`grep 'SUBTARGET=target_shared'
$(TOP)/$(SRC)/Makefile`" != . ]; then \
SHLIB_SUFFIX_NAME="`grep '^SHLIB_SUFFIX_NAME='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`"; \
SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`"; \
- echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/libhttpd.ep
$(root)$(libexecdir)/libhttpd.ep"; \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.ep
$(root)$(libexecdir)/libhttpd.ep; \
- echo "$(INSTALL_SCRIPT)
$(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}"; \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}; \
+ echo "$(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.ep
$(root)$(libexecdir)/libhttpd.ep"; \
+ $(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.ep
$(root)$(libexecdir)/libhttpd.ep; \
+ echo "$(INSTALL_DSO)
$(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}"; \
+ $(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}; \
if [ ".$${SHLIB_SUFFIX_LIST}" != . ]; then \
echo "$(RM)
$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.*"; \
$(RM) $(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.*; \
@@ -260,8 +261,8 @@
for mod in `egrep '^[ ]*SharedModule'
$(TOP)/$(SRC)/Configuration.apaci |\
sed -e 's/^[ ]*SharedModule[ ]*//'`; do \
file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
- echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/$${mod}
$(root)$(libexecdir)/$${file}"; \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/$${mod}
$(root)$(libexecdir)/$${file}; \
+ echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod}
$(root)$(libexecdir)/$${file}"; \
+ $(INSTALL_DSO) $(TOP)/$(SRC)/$${mod}
$(root)$(libexecdir)/$${file}; \
name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
echo dummy | awk '{ printf("LoadModule %-18s %s\n",
modname, modpath); }' \
modname="$${name}"
modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
