martin 98/01/09 07:15:27
Modified: . Tag: APACHE_1_2_X STATUS
src Tag: APACHE_1_2_X Configure Makefile.tmpl
Log:
The patch allows users to define the CC macro to more than one word, e.g.,
CC= cc -D_POSIX_SOURCE
or some such in the Configuration file. Until now, this would break because
it was passed unescaped to the subdirs, like: make CC=$(CC)
Reviewed by: Ken Coar, Dean Gaudet
Revision Changes Path
No revision
No revision
1.1.2.4 +2 -5 apache/Attic/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache/Attic/STATUS,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -u -r1.1.2.3 -r1.1.2.4
--- STATUS 1998/01/08 21:20:05 1.1.2.3
+++ STATUS 1998/01/09 15:13:40 1.1.2.4
@@ -4,7 +4,8 @@
Committed since 1.2.5:
- * nothing
+ * Martins portability change for ReliantUNIX/SINIX (_XPG_IV switch)
+ * Martin's [PATCH]-1.2.6: passing escaped CC='$(CC)'
Available:
@@ -34,10 +35,6 @@
* Mark Bixby's MPE port patch
<[EMAIL PROTECTED]>
Status: Mark +1, Dean +1
-
- * Martin's [PATCH]-1.2.6: passing escaped CC='$(CC)' (was: Re: STATUS:
1.2)
- <[EMAIL PROTECTED]>
- Status: Martin +1, Dean +1, Ken +1
* Martin's [PATCH]-1.2.6: avoid B_ERROR redeclaration (was: Re: STATUS:
1.2)
<[EMAIL PROTECTED]>
No revision
No revision
1.96.2.12 +1 -1 apache/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache/src/Configure,v
retrieving revision 1.96.2.11
retrieving revision 1.96.2.12
diff -u -u -r1.96.2.11 -r1.96.2.12
--- Configure 1998/01/09 14:50:50 1.96.2.11
+++ Configure 1998/01/09 15:15:21 1.96.2.12
@@ -674,7 +674,7 @@
@echo "Done cleaning module subdirectories"
placeholder \$(MODULES): ForceMe
- (cd \$@; \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)'
RANLIB='\$(RANLIB)')
+ (cd \$@; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)'
RANLIB='\$(RANLIB)')
ForceMe:
1.46.2.3 +2 -2 apache/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache/src/Makefile.tmpl,v
retrieving revision 1.46.2.2
retrieving revision 1.46.2.3
diff -u -u -r1.46.2.2 -r1.46.2.3
--- Makefile.tmpl 1997/07/01 01:33:31 1.46.2.2
+++ Makefile.tmpl 1998/01/09 15:15:24 1.46.2.3
@@ -29,11 +29,11 @@
$(CC) $(LFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
regex/libregex.a:
- (cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)')
+ (cd regex; $(MAKE) lib CC='$(CC)' AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)')
modules/last-built:
(cd modules; \
- $(MAKE) CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
+ $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
clean:
rm -f httpd *.o core
