fielding 97/03/24 14:49:12
Modified: src CHANGES Configure Makefile.tmpl Log: Generate makefile dependency for Configuration based on the actual name given when running the Configure process. Submitted by: Dean Gaudet Reviewed by: Roy Fielding, Chuck Murcko Revision Changes Path 1.211 +3 -0 apache/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.210 retrieving revision 1.211 diff -C3 -r1.210 -r1.211 *** CHANGES 1997/03/24 22:07:05 1.210 --- CHANGES 1997/03/24 22:49:08 1.211 *************** *** 42,47 **** --- 42,50 ---- *) Improved generation of modules/Makefile to be more generic for new module directories. [Ken Coar and Chuck Murcko] + *) Generate makefile dependency for Configuration based on the actual + name given when running the Configure process. [Dean Gaudet] + *) Fixed problem with vhost error log not being set prior to initializing virtual hosts. [Dean Gaudet] 1.84 +1 -1 apache/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.83 retrieving revision 1.84 diff -C3 -r1.83 -r1.84 *** Configure 1997/03/24 19:03:53 1.83 --- Configure 1997/03/24 22:49:09 1.84 *************** *** 566,572 **** # Now (finish) creating the makefiles cat Makefile.config >> Makefile ! cat "$makefile_tmpl" >> Makefile awk >>Makefile <$tmpfile \ '($3 ~ /modules\//) { printf "%s: modules/last-built ; @echo linking %s\n\n", $3, $3}' cat Makefile.config ../support/Makefile.tmpl > ../support/Makefile --- 566,572 ---- # Now (finish) creating the makefiles cat Makefile.config >> Makefile ! sed -e "s#@@Configuration@@#$file#" "$makefile_tmpl" >>Makefile awk >>Makefile <$tmpfile \ '($3 ~ /modules\//) { printf "%s: modules/last-built ; @echo linking %s\n\n", $3, $3}' cat Makefile.config ../support/Makefile.tmpl > ../support/Makefile 1.43 +5 -5 apache/src/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.42 retrieving revision 1.43 diff -C3 -r1.42 -r1.43 *** Makefile.tmpl 1997/03/18 10:23:54 1.42 --- Makefile.tmpl 1997/03/24 22:49:09 1.43 *************** *** 18,30 **** .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< ! all: Configuration httpd ! Configuration: Configuration.tmpl ! @echo "Configuration older than Configuration.tmpl, or doesn't exist." ! @echo "Consider copying Configuration.tmpl to Configuration, editing and rerunning" @echo "Configure." ! @echo "If not, you will at least have to touch Configuration." @false httpd: $(REGLIB) $(OBJS) --- 18,30 ---- .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< ! all: @@Configuration@@ httpd ! @@Configuration@@: Configuration.tmpl ! @echo "@@Configuration@@ older than Configuration.tmpl, or doesn't exist." ! @echo "Consider copying Configuration.tmpl to @@Configuration@@, editing and rerunning" @echo "Configure." ! @echo "If not, you will at least have to touch @@Configuration@@." @false httpd: $(REGLIB) $(OBJS)