]>
Commit | Line | Data |
---|---|---|
fce89d50 | 1 | diff -ur mod_perl-1.29.orig/Makefile.PL mod_perl-1.29/Makefile.PL |
2 | --- mod_perl-1.29.orig/Makefile.PL 2003-11-21 14:50:04.000000000 +0000 | |
3 | +++ mod_perl-1.29/Makefile.PL 2003-11-21 15:32:07.000000000 +0000 | |
4 | @@ -1420,16 +1420,16 @@ | |
5 | (cd ./apaci && $(MAKE) distclean) | |
6 | ||
7 | apxs_libperl: | |
8 | - (cd ./apaci && $(PERL5LIB) $(MAKE)) | |
9 | + (cd ./apaci && $(PERL5LIB) $(MAKE) OPTIMIZE="$(OPTIMIZE)") | |
10 | ||
11 | apxs_install: apxs_libperl | |
12 | (cd ./apaci && $(MAKE) install;) | |
13 | ||
14 | apache_httpd: $(APACHE_SRC)/Makefile.tmpl | |
15 | - (cd $(APACHE_SRC) && $(PERL5LIB) $(SHRPENV) $(MAKE) CC="$(CC)";) | |
16 | + (cd $(APACHE_SRC) && $(PERL5LIB) $(SHRPENV) $(MAKE) CC="$(CC)" OPTIMIZE="$(OPTIMIZE)";) | |
17 | ||
18 | apaci_httpd: | |
19 | - (cd $(APACHE_ROOT) && $(PERL5LIB) $(MAKE)) | |
20 | + (cd $(APACHE_ROOT) && $(PERL5LIB) $(MAKE) OPTIMIZE="$(OPTIMIZE)") | |
21 | ||
22 | apaci_install: | |
23 | (cd $(APACHE_ROOT) && $(MAKE) install) | |
24 | @@ -1448,7 +1448,7 @@ | |
25 | -e 's,^$(APACHE_SRC),,;' \ | |
26 | -e 'system "echo src$$_ >> MANIFEST";' \ | |
27 | -e '}' | |
28 | - $(MAKE) dist | |
29 | + $(MAKE) dist OPTIMIZE="$(OPTIMIZE)" | |
30 | $(RM_RF) src/include/ | |
31 | $(RM) src/Makefile.config | |
32 | $(MV) MANIFEST.orig MANIFEST | |
33 | diff -ur mod_perl-1.29.orig/apaci/Makefile.tmpl mod_perl-1.29/apaci/Makefile.tmpl | |
34 | --- mod_perl-1.29.orig/apaci/Makefile.tmpl 2001-02-11 15:33:12.000000000 +0000 | |
35 | +++ mod_perl-1.29/apaci/Makefile.tmpl 2003-11-21 15:23:36.000000000 +0000 | |
36 | @@ -13,8 +13,8 @@ | |
37 | # Reassemble mod_perl parameters | |
38 | # from Perl and Apache parameters | |
39 | MP_CC=$(PERL_CC) | |
40 | -MP_CFLAGS=$(PERL_OPTIMIZE) -I$(PERL_INC) $(PERL_CCFLAGS) \ | |
41 | - $(PERL_DEFS) $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) | |
42 | +MP_CFLAGS=-I$(PERL_INC) $(PERL_CCFLAGS) \ | |
43 | + $(PERL_DEFS) $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) $(OPTIMIZE) | |
44 | MP_CFLAGS_SHLIB=$(PERL_CCCDLFLAGS) $(MP_CFLAGS) | |
45 | MP_LD=$(PERL_LD) | |
46 | MP_LDFLAGS_SHLIB=$(PERL_LDDLFLAGS) | |
47 | @@ -99,7 +99,7 @@ | |
48 | depend: | |
49 | cp Makefile.tmpl Makefile.tmpl.bak \ | |
50 | && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \ | |
51 | - && gcc -MM $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) *.c >> Makefile.new \ | |
52 | + && gcc -MM $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) $(OPTIMIZE) *.c >> Makefile.new \ | |
53 | && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ | |
54 | -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ | |
55 | > Makefile.tmpl \ |