rse 98/06/09 04:00:20
Modified: . Makefile.tmpl
src CHANGES
Log:
Make sure the "install" target of the top-level Makefile doesn't break because
of a return code of 1 from an "if" (for instance under braindead Ultrix the
result code of an "if" construct is 1 if the "then" clause didn't match).
Thanks to Ben Hyde for discovering this subtle problem.
Revision Changes Path
1.38 +3 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.tmpl 1998/06/05 08:20:04 1.37
+++ Makefile.tmpl 1998/06/09 11:00:18 1.38
@@ -177,7 +177,9 @@
# separate parts of the installation process.
install:
@if [ ! -f $(TOP)/$(SRC)/.apaci.build.ok ]; then \
- $(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) build; \
+ $(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) build; \
+ else \
+ :; \
fi
@$(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) \
install-mktree install-programs $(install-support) \
1.903 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -r1.902 -r1.903
--- CHANGES 1998/06/09 10:30:11 1.902
+++ CHANGES 1998/06/09 11:00:19 1.903
@@ -1,5 +1,10 @@
Changes with Apache 1.3.1
+ *) Make sure the "install" target of the top-level Makefile doesn't break
+ because of a return code of 1 from an "if" (for instance under braindead
+ Ultrix the result code of an "if" construct is 1 if the "then" clause
+ didn't match). [Ralf S. Engelschall]
+
*) Add an additional "dummy" target to the "$(LIB)" target in generated
modules/xxx/Makefile's to avoid problems with SVR4 Make under "full-DSO"
situation (no libxxx.a built, only mod_xxx.so's) where LIB and OBJS are
