rasmus 99/06/16 15:19:22
Modified: . Makefile.tmpl
src CHANGES Configure
Log:
Only install httpd.exp if $SHLIB_EXPORT_FILES is set
Revision Changes Path
1.85 +5 -2 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Makefile.tmpl 1999/06/16 21:27:15 1.84
+++ Makefile.tmpl 1999/06/16 22:19:14 1.85
@@ -277,8 +277,11 @@
[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); \
- $(CP) $(TOP)/$(SRC)/support/httpd.exp $(root)$(libexecdir)/; \
- chmod 644 $(root)$(libexecdir)/httpd.exp; \
+ SHLIB_EXPORT_FILES="`grep '^SHLIB_EXPORT_FILES='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`"; \
+ if [ ".$${SHLIB_EXPORT_FILES}" != . ]; then \
+ $(CP) $(TOP)/$(SRC)/support/httpd.exp
$(root)$(libexecdir)/; \
+ chmod 644 $(root)$(libexecdir)/httpd.exp; \
+ fi; \
else \
echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET)"; \
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
1.1379 +2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1378
retrieving revision 1.1379
diff -u -r1.1378 -r1.1379
--- CHANGES 1999/06/13 19:59:38 1.1378
+++ CHANGES 1999/06/16 22:19:16 1.1379
@@ -1,4 +1,6 @@
Changes with Apache 1.3.7
+ *) Fix apxs build issues on AIX
+ [Rasmus Lerdorf <[EMAIL PROTECTED]>]
*) New directive, DocumentRootCheck, added to determine if
we bother doing the stat of each DocumentRoot during
1.354 +1 -0 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- Configure 1999/06/09 10:45:00 1.353
+++ Configure 1999/06/16 22:19:16 1.354
@@ -1811,6 +1811,7 @@
echo "SUBTARGET=$SUBTARGET" >> Makefile
echo "SHLIB_SUFFIX_NAME=$SHLIB_SUFFIX_NAME" >> Makefile
echo "SHLIB_SUFFIX_LIST=$SHLIB_SUFFIX_LIST" >> Makefile
+echo "SHLIB_EXPORT_FILES=$SHLIB_EXPORT_FILES" >> Makefile
echo "" >> Makefile
####################################################################