1 https://code.google.com/p/modpagespeed/issues/detail?id=632
3 --- modpagespeed-1.5.27.2/install/Makefile 2013-05-03 15:33:46.493803262 +0300
4 +++ modpagespeed-1.5.27.2/install/Makefile 2013-05-03 16:15:38.104831966 +0300
5 @@ -186,154 +186,154 @@
7 ifeq ($(STRESS_TEST),1)
9 - STRESS_TEST_SED_PATTERN=^\#STRESS
10 + STRESS_TEST_SED_PATTERN=s/^\#STRESS//
13 - STRESS_TEST_SED_PATTERN=^\#STRESS.*\n
14 + STRESS_TEST_SED_PATTERN=/^\#STRESS/d
17 ifeq ($(REWRITE_TEST),1)
19 - REWRITE_TEST_SED_PATTERN=^\#REWRITE
20 + REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
23 - REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
24 + REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
27 ifeq ($(COVERAGE_TRACE_TEST),1)
28 # remove coverage prefix
29 - COVERAGE_TEST_SED_PATTERN=^\#COVERAGE
30 + COVERAGE_TEST_SED_PATTERN=s/^\#COVERAGE//
32 # remove coverage lines
33 - COVERAGE_TEST_SED_PATTERN=^\#COVERAGE.*\n
34 + COVERAGE_TEST_SED_PATTERN=/^\#COVERAGE/d
37 ifeq ($(PROXY_TEST),1)
39 - PROXY_TEST_SED_PATTERN=^\#PROXY
40 + PROXY_TEST_SED_PATTERN=s/^\#PROXY//
43 - PROXY_TEST_SED_PATTERN=^\#PROXY.*\n
44 + PROXY_TEST_SED_PATTERN=/^\#PROXY/d
47 ifeq ($(SLURP_TEST),1)
49 - SLURP_TEST_SED_PATTERN=^\#SLURP
50 + SLURP_TEST_SED_PATTERN=s/^\#SLURP//
53 - SLURP_TEST_SED_PATTERN=^\#SLURP.*\n
54 + SLURP_TEST_SED_PATTERN=/^\#SLURP/d
57 ifeq ($(SHARED_MEM_LOCK_TEST),1)
59 - SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS
60 + SHARED_MEM_LOCK_TEST_SED_PATTERN=s/^\#SHARED_MEM_LOCKS//
63 - SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS.*\n
64 + SHARED_MEM_LOCK_TEST_SED_PATTERN=/^\#SHARED_MEM_LOCKS/d
67 ifeq ($(MEMCACHED_TEST),1)
69 - MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED
70 + MEMCACHED_TEST_SED_PATTERN=s/^\#MEMCACHED//
73 - MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED.*\n
74 + MEMCACHED_TEST_SED_PATTERN=/^\#MEMCACHED/d
77 ifeq ($(MEMCACHE_COVERAGE_TEST),1)
79 - MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE
80 + MEMCACHE_COVERAGE_TEST_SED_PATTERN=s/^\#MEMCACHE_COVERAGE//
83 - MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE.*\n
84 + MEMCACHE_COVERAGE_TEST_SED_PATTERN=/^\#MEMCACHE_COVERAGE/d
87 ifeq ($(PURGING_COVERAGE_TEST),1)
89 - PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE
90 + PURGING_COVERAGE_TEST_SED_PATTERN=s/^\#PURGING_COVERAGE//
93 - PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE.*\n
94 + PURGING_COVERAGE_TEST_SED_PATTERN=/^\#PURGING_COVERAGE/d
97 ifeq ($(SPELING_TEST),1)
99 - SPELING_TEST_SED_PATTERN=^\#SPELING
100 + SPELING_TEST_SED_PATTERN=s/^\#SPELING//
103 - SPELING_TEST_SED_PATTERN=^\#SPELING.*\n
104 + SPELING_TEST_SED_PATTERN=/^\#SPELING/d
107 ifeq ($(REWRITE_TEST),1)
109 - REWRITE_TEST_SED_PATTERN=^\#REWRITE
110 + REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
113 - REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
114 + REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
117 ifeq ($(GZIP_TEST),1)
119 - GZIP_TEST_SED_PATTERN=^\#GZIP
120 + GZIP_TEST_SED_PATTERN=s/^\#GZIP//
123 - GZIP_TEST_SED_PATTERN=^\#GZIP.*\n
124 + GZIP_TEST_SED_PATTERN=/^\#GZIP/d
127 ifeq ($(FURIOUS_GA_TEST),1)
129 - FURIOUS_GA_TEST_SED_PATTERN=^\#FURIOUS_GA
130 + FURIOUS_GA_TEST_SED_PATTERN=s/^\#FURIOUS_GA//
133 - FURIOUS_GA_TEST_SED_PATTERN=^\#FURIOUS_GA.*\n
134 + FURIOUS_GA_TEST_SED_PATTERN=/^\#FURIOUS_GA/d
137 ifeq ($(FURIOUS_NO_GA_TEST),1)
139 - FURIOUS_NO_GA_TEST_SED_PATTERN=^\#FURIOUS_NO_GA
140 + FURIOUS_NO_GA_TEST_SED_PATTERN=s/^\#FURIOUS_NO_GA//
143 - FURIOUS_NO_GA_TEST_SED_PATTERN=^\#FURIOUS_NO_GA.*\n
144 + FURIOUS_NO_GA_TEST_SED_PATTERN=/^\#FURIOUS_NO_GA/d
147 ifeq ($(HTTPS_TEST),1)
149 - HTTPS_TEST_SED_PATTERN=^\#HTTPS
150 + HTTPS_TEST_SED_PATTERN=s/^\#HTTPS//
153 - HTTPS_TEST_SED_PATTERN=^\#HTTPS.*\n
154 + HTTPS_TEST_SED_PATTERN=/^\#HTTPS/d
157 ifeq ($(ALL_DIRECTIVES_TEST),1)
159 - ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES
160 + ALL_DIRECTIVES_TEST_SED_PATTERN=s/^\#ALL_DIRECTIVES//
163 - ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES.*\n
164 + ALL_DIRECTIVES_TEST_SED_PATTERN=/^\#ALL_DIRECTIVES/d
167 ifeq ($(PER_VHOST_STATS_TEST),1)
169 - PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS
170 + PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#PER_VHOST_STATS//
173 - PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS.*\n
174 + PER_VHOST_STATS_TEST_SED_PATTERN=/^\#PER_VHOST_STATS/d
177 ifeq ($(NO_PER_VHOST_STATS_TEST),1)
179 - NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS
180 + NO_PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#NO_PER_VHOST_STATS//
183 - NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS.*\n
184 + NO_PER_VHOST_STATS_TEST_SED_PATTERN=/^\#NO_PER_VHOST_STATS/d
187 ifeq ($(STATS_LOGGING_TEST),1)
189 - STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING
190 + STATS_LOGGING_TEST_SED_PATTERN=s/^\#STATS_LOGGING//
193 - STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING.*\n
194 + STATS_LOGGING_TEST_SED_PATTERN=/^\#STATS_LOGGING/d
197 # Note that the quoted sed replacement for APACHE_SLURP_DIR_COMMAND is because
198 @@ -351,24 +351,24 @@
199 -e "s@# ModPagespeedSlurpDirectory ...@$(APACHE_SLURP_DIR_COMMAND)@g" \
200 -e "s@# ModPagespeedSlurpReadOnly on@$(APACHE_SLURP_READ_ONLY_COMMAND)@g" \
201 -e "s|@@TMP_SLURP_DIR@@|$(TMP_SLURP_DIR)|g" \
202 - -e "s@$(STRESS_TEST_SED_PATTERN)@@" \
203 - -e "s@$(REWRITE_TEST_SED_PATTERN)@@" \
204 - -e "s@$(COVERAGE_TEST_SED_PATTERN)@@" \
205 - -e "s@$(PROXY_TEST_SED_PATTERN)@@" \
206 - -e "s@$(SLURP_TEST_SED_PATTERN)@@" \
207 - -e "s@$(SHARED_MEM_LOCK_TEST_SED_PATTERN)@@" \
208 - -e "s@$(SPELING_TEST_SED_PATTERN)@@" \
209 - -e "s@$(MEMCACHED_TEST_SED_PATTERN)@@" \
210 - -e "s@$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)@@" \
211 - -e "s@$(PURGING_COVERAGE_TEST_SED_PATTERN)@@" \
212 - -e "s@$(GZIP_TEST_SED_PATTERN)@@" \
213 - -e "s@$(HTTPS_TEST_SED_PATTERN)@@" \
214 - -e "s@$(FURIOUS_GA_TEST_SED_PATTERN)@@" \
215 - -e "s@$(FURIOUS_NO_GA_TEST_SED_PATTERN)@@" \
216 - -e "s@$(ALL_DIRECTIVES_TEST_SED_PATTERN)@@" \
217 - -e "s@$(PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
218 - -e "s@$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
219 - -e "s@$(STATS_LOGGING_TEST_SED_PATTERN)@@" \
220 + -e "$(STRESS_TEST_SED_PATTERN)" \
221 + -e "$(REWRITE_TEST_SED_PATTERN)" \
222 + -e "$(COVERAGE_TEST_SED_PATTERN)" \
223 + -e "$(PROXY_TEST_SED_PATTERN)" \
224 + -e "$(SLURP_TEST_SED_PATTERN)" \
225 + -e "$(SHARED_MEM_LOCK_TEST_SED_PATTERN)" \
226 + -e "$(SPELING_TEST_SED_PATTERN)" \
227 + -e "$(MEMCACHED_TEST_SED_PATTERN)" \
228 + -e "$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)" \
229 + -e "$(PURGING_COVERAGE_TEST_SED_PATTERN)" \
230 + -e "$(GZIP_TEST_SED_PATTERN)" \
231 + -e "$(HTTPS_TEST_SED_PATTERN)" \
232 + -e "$(FURIOUS_GA_TEST_SED_PATTERN)" \
233 + -e "$(FURIOUS_NO_GA_TEST_SED_PATTERN)" \
234 + -e "$(ALL_DIRECTIVES_TEST_SED_PATTERN)" \
235 + -e "$(PER_VHOST_STATS_TEST_SED_PATTERN)" \
236 + -e "$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)" \
237 + -e "$(STATS_LOGGING_TEST_SED_PATTERN)" \
239 ! grep '@@' $@ # Make sure we don't have any remaining @@variables@@