You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Rodent of Unusual Size <co...@hyperreal.org> on 1997/07/14 12:20:04 UTC

cvs commit: apache/src Configure Makefile.tmpl

coar        97/07/14 03:20:03

  Modified:    src       Configure Makefile.tmpl
  Log:
  	Put quotes around $(CC) where it's passed to subordinate
  	environments.  on IRIX, mod_perl requires "-n32", and mucks
  	with the CC macro.  This isn't the optimal solution, but it
  	does no harm; hopefully mod_perl can be convinced to Do It
  	Right.
  
  Submitted by:	Fernando Lopez-Lezcano <na...@ccrma.stanford.edu>
  
  Revision  Changes    Path
  1.108     +1 -1      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -C3 -r1.107 -r1.108
  *** Configure	1997/07/11 03:55:04	1.107
  --- Configure	1997/07/14 10:20:00	1.108
  ***************
  *** 682,688 ****
    	@echo "Done cleaning module subdirectories"
    
    placeholder \$(MODULES): ForceMe
  ! 	(cd \$@; \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')
    
    ForceMe:
    
  --- 682,688 ----
    	@echo "Done cleaning module subdirectories"
    
    placeholder \$(MODULES): ForceMe
  ! 	(cd \$@; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')
    
    ForceMe:
    
  
  
  
  1.51      +2 -2      apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -C3 -r1.50 -r1.51
  *** Makefile.tmpl	1997/06/30 22:26:54	1.50
  --- Makefile.tmpl	1997/07/14 10:20:01	1.51
  ***************
  *** 29,39 ****
    	$(CC) $(LDFLAGS)  -o httpd $(OBJS) $(REGLIB) $(LIBS)
    
    regex/libregex.a:
  ! 	(cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
    
    modules/last-built:
    	(cd modules; \
  ! 	$(MAKE) CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
    
    clean:
    	rm -f httpd *.o core
  --- 29,39 ----
    	$(CC) $(LDFLAGS)  -o httpd $(OBJS) $(REGLIB) $(LIBS)
    
    regex/libregex.a:
  ! 	(cd regex; $(MAKE) lib CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
    
    modules/last-built:
    	(cd modules; \
  ! 	$(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
    
    clean:
    	rm -f httpd *.o core