rse 98/04/08 09:08:13
Modified: . STATUS Makefile.tmpl
src CHANGES Configure Makefile.tmpl
Log:
Allow correct breaks on errors even for the top-level Makefile.
Revision Changes Path
1.279 +1 -0 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- STATUS 1998/04/08 10:34:04 1.278
+++ STATUS 1998/04/08 16:08:09 1.279
@@ -158,6 +158,7 @@
* Ralf's initial doc and Configuration.tmpl entry for mod_mmap_static
* OS/2 tweak to deal with multiple .exe targets. [Brian Havard]
* Fixed ordering of argument checks for RewriteBase directive, PR#2045
+ * Ralf's cleanup of subdir movement to again allow correct breaks on
error
Available Patches:
1.10 +2 -2 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1998/04/08 11:59:56 1.9
+++ Makefile.tmpl 1998/04/08 16:08:10 1.10
@@ -144,7 +144,7 @@
# build the standard stuff
build-std:
- @cd $(SRC); $(MAKE) $(MFLAGS) all 2>&1 | sed -e 's:^\([=<]==[>=]\) :\1
$(SRC)/:'
+ @cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ all
# build the additional support stuff
build-support:
@@ -351,7 +351,7 @@
# clean the standard stuff
clean-std:
- @cd $(SRC); $(MAKE) $(MFLAGS) clean | sed -e 's:^\([=<]==[>=]\) :\1
$(SRC)/:'
+ @cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ clean
# clean additional support stuff
clean-support:
1.760 +8 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.759
retrieving revision 1.760
diff -u -r1.759 -r1.760
--- CHANGES 1998/04/08 06:40:22 1.759
+++ CHANGES 1998/04/08 16:08:11 1.760
@@ -1,5 +1,13 @@
Changes with Apache 1.3b6
+ *) Allow top-level (APACI) Makefile to break on build errors
+ the same way the src/ subtree Makefiles breaks on them by replacing the
+ initial APACI sed-subdir-display-kludge with a more clean
+ variable-passing-solution: variable SDP can optionally hold the subdir
+ prefix which is consistently used for displaying the subdir movement.
+ This way even the top-level Makefile can stop correctly on errors as the
+ user expects. [Ralf S. Engelschall]
+
*) Fixed ordering of argument checks for RewriteBase directive.
[Todd Eigenschink <[EMAIL PROTECTED]>, PR#2045]
1.229 +3 -3 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- Configure 1998/04/05 21:34:38 1.228
+++ Configure 1998/04/08 16:08:11 1.229
@@ -1389,9 +1389,9 @@
all clean depend ::
@for i in \$(MODULES); do \\
- echo "===> modules/\$\$i"; \\
- (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) CC='\$(CC)'
AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\
- echo "<=== modules/\$\$i"; \\
+ echo "===> \$(SDP)modules/\$\$i"; \\
+ (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)'
CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\
+ echo "<=== \$(SDP)modules/\$\$i"; \\
done
EOF
1.88 +9 -9 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- Makefile.tmpl 1998/03/26 04:58:37 1.87
+++ Makefile.tmpl 1998/04/08 16:08:12 1.88
@@ -29,24 +29,24 @@
subdirs:
@for i in $(SUBDIRS); do \
- echo "===> $$i"; \
- ( cd $$i && $(MAKE) $(MFLAGS_STATIC) CC='$(CC)'
AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \
- echo "<=== $$i"; \
+ echo "===> $(SDP)$$i"; \
+ ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)'
AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \
+ echo "<=== $(SDP)$$i"; \
done
support: support-dir
support-dir:
- @echo "===> support"; \
- cd support; $(MAKE) $(MFLAGS_STATIC) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)'; \
- echo "<=== support"
+ @echo "===> $(SDP)support"; \
+ cd support; $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)'
AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)'; \
+ echo "<=== $(SDP)support"
clean:
rm -f $(TARGET) *.o
@for i in $(SUBDIRS); do \
- echo "===> $$i"; \
- ( cd $$i && $(MAKE) $(MFLAGS_STATIC) $@ ) || exit 1; \
- echo "<=== $$i"; \
+ echo "===> $(SDP)$$i"; \
+ ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit
1; \
+ echo "<=== $(SDP)$$i"; \
done
# We really don't expect end users to use this rule. It works only with
