This puts Apache's CFLAGS into AP_CFLAGS instead of CFLAGS, so that
wacky people like me who like to override CFLAGS from the make line
(make CFLAGS='-arch ppc -arch i386') can do so without stomping the
Apache flags.
-Fred
Index: Makefile.tmpl
===================================================================
RCS file:
/cvs/Darwin/Services/apache_mod_perl/mod_perl/apaci/Makefile.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.tmpl 2000/11/22 01:27:59 1.4
+++ Makefile.tmpl 2001/02/07 03:55:12 1.5
@@ -14,7 +14,7 @@
# from Perl and Apache parameters
MP_CC=$(PERL_CC)
MP_CFLAGS=$(PERL_OPTIMIZE) -I$(PERL_INC) $(PERL_CCFLAGS) \
- $(PERL_DEFS) $(INCLUDES) $(CFLAGS)
+ $(PERL_DEFS) $(INCLUDES) $(AP_CFLAGS) $(CFLAGS)
MP_CFLAGS_SHLIB=$(PERL_CCCDLFLAGS) $(MP_CFLAGS)
MP_LD=$(PERL_LD)
MP_LDFLAGS_SHLIB=$(PERL_LDDLFLAGS)
@@ -101,7 +101,7 @@
depend:
cp Makefile.tmpl Makefile.tmpl.bak \
&& sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
+ && gcc -MM $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) *.c >>
Makefile.new \
&& sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
-e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
> Makefile.tmpl \
1.2 +1 -1 Services/apache_mod_perl/mod_perl/apaci/configure
Index: configure
===================================================================
RCS file:
/cvs/Darwin/Services/apache_mod_perl/mod_perl/apaci/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 2000/03/31 05:26:41 1.1
+++ configure 2001/02/07 03:55:12 1.2
@@ -91,7 +91,7 @@
echo "##" >>$my_makefileconf
echo "" >>$my_makefileconf
echo "# provide some stuff Apache usually provides"
>>$my_makefileconf
-echo "CFLAGS=-DMOD_PERL $my_apxs_cflags" >>$my_makefileconf
+echo "AP_CFLAGS=-DMOD_PERL $my_apxs_cflags" >>$my_makefileconf
echo "INCLUDES=$my_apxs_includes" >>$my_makefileconf
echo "RANLIB=ranlib" >>$my_makefileconf
echo "LIBEXT=so" >>$my_makefileconf
