fielding 99/02/10 04:09:38
Modified: . Makefile.tmpl STATUS
src CHANGES
src/helpers install.sh
Log:
Added -S option to install.sh so that options can be passed to
strip on some platforms.
Submitted by: Ralf S. Engelschall, Wilfredo Sanchez
Reviewed by: Roy Fielding, Dirk-Willem van Gulik, Jim Jagielski
Revision Changes Path
1.64 +19 -7 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Makefile.tmpl 1999/01/15 20:06:56 1.63
+++ Makefile.tmpl 1999/02/10 12:09:33 1.64
@@ -81,10 +81,16 @@
RM = rm -f
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
+IFLAGS_PROGRAM = -m 755 -s
+IFLAGS_CORE = -m 755
+IFLAGS_DSO = -m 755
+IFLAGS_SCRIPT = -m 755
+IFLAGS_DATA = -m 644
+INSTALL_PROGRAM = $(INSTALL) $(IFLAGS_PROGRAM)
+INSTALL_CORE = $(INSTALL) $(IFLAGS_CORE)
+INSTALL_DSO = $(INSTALL) $(IFLAGS_DSO)
+INSTALL_SCRIPT = $(INSTALL) $(IFLAGS_SCRIPT)
+INSTALL_DATA = $(INSTALL) $(IFLAGS_DATA)
PERL = @PERL@
TAR = @TAR@
TAROPT = @TAROPT@
@@ -253,12 +259,18 @@
# shared object files.
install-programs:
@echo "===> [programs: Installing Apache $(TARGET) program and shared
objects]"
- $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET)
+ [EMAIL PROTECTED] [ ".`grep '^[ ]*AddModule.*mod_so\.o'
$(TOP)/$(SRC)/Configuration.apaci`" != . ]; then \
+ echo "$(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET)"; \
+ $(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
+ else \
+ echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET)"; \
+ $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
+ fi
[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_DSO) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep"; \
- $(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep; \
+ echo "$(INSTALL_CORE) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep"; \
+ $(INSTALL_CORE) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep; \
echo "$(INSTALL_DSO)
$(TOP)/$(SRC)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}"; \
$(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}; \
if [ ".$${SHLIB_SUFFIX_LIST}" != . ]; then \
1.619 +1 -5 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -r1.618 -r1.619
--- STATUS 1999/02/10 11:48:42 1.618
+++ STATUS 1999/02/10 12:09:34 1.619
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/02/10 11:48:42 $]
+ Last modified at [$Date: 1999/02/10 12:09:34 $]
Release:
@@ -83,10 +83,6 @@
* Ralf's patch to fix append of target name to layout paths
Message-ID: <[EMAIL PROTECTED]>
Status: Ralf +1, Roy +1
-
- * Ralf's adjusted version of Fred's Add strip flags variables
- Message-ID: <[EMAIL PROTECTED]>
- Status: Ralf +1, Dirkx +1, Fred +1, Jim +1
* Fred's PATCH: man page section numbers
Message-ID: <[EMAIL PROTECTED]>
1.1247 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1246
retrieving revision 1.1247
diff -u -r1.1246 -r1.1247
--- CHANGES 1999/02/10 11:48:43 1.1246
+++ CHANGES 1999/02/10 12:09:36 1.1247
@@ -1,5 +1,8 @@
Changes with Apache 1.3.5
+ *) Added -S option to install.sh so that options can be passed to
+ strip on some platforms. [Ralf S. Engelschall, Wilfredo Sanchez]
+
*) Tweak modules Makefile generated by Configure so that it handles
the test case of no modules being selected. [EMAIL PROTECTED]
1.6 +5 -1 apache-1.3/src/helpers/install.sh
Index: install.sh
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/install.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- install.sh 1999/01/16 22:00:48 1.5
+++ install.sh 1999/02/10 12:09:38 1.6
@@ -51,7 +51,11 @@
shift; shift; continue
;;
-s) stripcmd="$stripprog"
- shift; continue;;
+ shift; continue
+ ;;
+ -S) stripcmd="$stripprog $2"
+ shift; shift; continue
+ ;;
*) if [ "x$src" = "x" ]; then
src=$1
else
