[packages/apache-mod_pagespeed.git] / bug-632.patch

https://code.google.com/p/modpagespeed/issues/detail?id=632

patterns used (vim):

update pattern to remove prefixes
:%s,\^\\#\([A-Z_]*\)$,s/&//,

update pattern to remove whole lines:
:%s,\^\\#\([A-Z_]*\)\.\*\\n,/^\\#\1/d,

update subst lines
:%s#-e "s@\$(\([A-Z_]*_PATTERN\))@@"#-e "$(\1)"#

--- modpagespeed-1.8.31.5/install/Makefile~	2014-12-14 16:05:55.000000000 +0200
+++ modpagespeed-1.8.31.5/install/Makefile	2014-12-14 16:12:55.900374377 +0200
@@ -190,176 +190,176 @@
 
 ifeq ($(STRESS_TEST),1)
   # remove prefix
-  STRESS_TEST_SED_PATTERN=^\#STRESS
+  STRESS_TEST_SED_PATTERN=s/^\#STRESS//
 else
   # remove whole line
-  STRESS_TEST_SED_PATTERN=^\#STRESS.*\n
+  STRESS_TEST_SED_PATTERN=/^\#STRESS/d
 endif
 
 ifeq ($(REWRITE_TEST),1)
   # remove prefix
-  REWRITE_TEST_SED_PATTERN=^\#REWRITE
+  REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
 else
   # remove whole line
-  REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
+  REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
 endif
 
 ifeq ($(COVERAGE_TRACE_TEST),1)
   # remove coverage prefix
-  COVERAGE_TEST_SED_PATTERN=^\#COVERAGE
+  COVERAGE_TEST_SED_PATTERN=s/^\#COVERAGE//
 else
   # remove coverage lines
-  COVERAGE_TEST_SED_PATTERN=^\#COVERAGE.*\n
+  COVERAGE_TEST_SED_PATTERN=/^\#COVERAGE/d
 endif
 
 ifeq ($(PROXY_TEST),1)
   # remove prefix
-  PROXY_TEST_SED_PATTERN=^\#PROXY
+  PROXY_TEST_SED_PATTERN=s/^\#PROXY//
 else
   # remove whole line
-  PROXY_TEST_SED_PATTERN=^\#PROXY.*\n
+  PROXY_TEST_SED_PATTERN=/^\#PROXY/d
 endif
 
 ifeq ($(SLURP_TEST),1)
   # remove prefix
-  SLURP_TEST_SED_PATTERN=^\#SLURP
+  SLURP_TEST_SED_PATTERN=s/^\#SLURP//
 else
   # remove whole line
-  SLURP_TEST_SED_PATTERN=^\#SLURP.*\n
+  SLURP_TEST_SED_PATTERN=/^\#SLURP/d
 endif
 
 ifeq ($(SHARED_MEM_LOCK_TEST),1)
   # remove prefix
-  SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS
+  SHARED_MEM_LOCK_TEST_SED_PATTERN=s/^\#SHARED_MEM_LOCKS//
 else
   # remove whole line
-  SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS.*\n
+  SHARED_MEM_LOCK_TEST_SED_PATTERN=/^\#SHARED_MEM_LOCKS/d
 endif
 
 ifeq ($(MEMCACHED_TEST),1)
   # remove prefix
-  MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED
+  MEMCACHED_TEST_SED_PATTERN=s/^\#MEMCACHED//
 else
   # remove whole line
-  MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED.*\n
+  MEMCACHED_TEST_SED_PATTERN=/^\#MEMCACHED/d
 endif
 
 ifeq ($(IPRO_PRESERVE_COVERAGE_TEST),1)
   # remove prefix
-  IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=^\#IPRO_PRESERVE_COVERAGE
+  IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=s/^\#IPRO_PRESERVE_COVERAGE//
 else
   # remove whole line
-  IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=^\#IPRO_PRESERVE_COVERAGE.*\n
+  IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=/^\#IPRO_PRESERVE_COVERAGE/d
 endif
 
 ifeq ($(MEMCACHE_COVERAGE_TEST),1)
   # remove prefix
-  MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE
+  MEMCACHE_COVERAGE_TEST_SED_PATTERN=s/^\#MEMCACHE_COVERAGE//
 else
   # remove whole line
-  MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE.*\n
+  MEMCACHE_COVERAGE_TEST_SED_PATTERN=/^\#MEMCACHE_COVERAGE/d
 endif
 
 ifeq ($(PURGING_COVERAGE_TEST),1)
   # remove prefix
-  PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE
+  PURGING_COVERAGE_TEST_SED_PATTERN=s/^\#PURGING_COVERAGE//
 else
   # remove whole line
-  PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE.*\n
+  PURGING_COVERAGE_TEST_SED_PATTERN=/^\#PURGING_COVERAGE/d
 endif
 
 ifeq ($(IUR_COVERAGE_TEST),1)
   # remove prefix
-  IUR_COVERAGE_TEST_SED_PATTERN=^\#IUR_COVERAGE
+  IUR_COVERAGE_TEST_SED_PATTERN=s/^\#IUR_COVERAGE//
   # remove whole explicit domain authorization line
-  DOMAIN_AUTH_SED_PATTERN=^\#DOMAIN_AUTH_COVERAGE.*\n
+  DOMAIN_AUTH_SED_PATTERN=/^\#DOMAIN_AUTH_COVERAGE/d
 else
   # remove whole line
-  IUR_COVERAGE_TEST_SED_PATTERN=^\#IUR_COVERAGE.*\n
+  IUR_COVERAGE_TEST_SED_PATTERN=/^\#IUR_COVERAGE/d
   ifeq ($(COVERAGE_TRACE_TEST),1)
     # remove prefix for explicit domain authorization line
-    DOMAIN_AUTH_SED_PATTERN=^\#DOMAIN_AUTH_COVERAGE
+    DOMAIN_AUTH_SED_PATTERN=s/^\#DOMAIN_AUTH_COVERAGE//
   endif
 endif
 
 ifeq ($(SPELING_TEST),1)
   # remove prefix
-  SPELING_TEST_SED_PATTERN=^\#SPELING
+  SPELING_TEST_SED_PATTERN=s/^\#SPELING//
 else
   # remove whole line
-  SPELING_TEST_SED_PATTERN=^\#SPELING.*\n
+  SPELING_TEST_SED_PATTERN=/^\#SPELING/d
 endif
 
 ifeq ($(REWRITE_TEST),1)
   # remove prefix
-  REWRITE_TEST_SED_PATTERN=^\#REWRITE
+  REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
 else
   # remove whole line
-  REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
+  REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
 endif
 
 ifeq ($(GZIP_TEST),1)
   # remove prefix
-  GZIP_TEST_SED_PATTERN=^\#GZIP
+  GZIP_TEST_SED_PATTERN=s/^\#GZIP//
 else
   # remove whole line
-  GZIP_TEST_SED_PATTERN=^\#GZIP.*\n
+  GZIP_TEST_SED_PATTERN=/^\#GZIP/d
 endif
 
 ifeq ($(EXPERIMENT_GA_TEST),1)
   # remove prefix
-  EXPERIMENT_GA_TEST_SED_PATTERN=^\#EXPERIMENT_GA
+  EXPERIMENT_GA_TEST_SED_PATTERN=s/^\#EXPERIMENT_GA//
 else
   # remove whole line
-  EXPERIMENT_GA_TEST_SED_PATTERN=^\#EXPERIMENT_GA.*\n
+  EXPERIMENT_GA_TEST_SED_PATTERN=/^\#EXPERIMENT_GA/d
 endif
 
 ifeq ($(EXPERIMENT_NO_GA_TEST),1)
   # remove prefix
-  EXPERIMENT_NO_GA_TEST_SED_PATTERN=^\#EXPERIMENT_NO_GA
+  EXPERIMENT_NO_GA_TEST_SED_PATTERN=s/^\#EXPERIMENT_NO_GA//
 else
   # remove whole line
-  EXPERIMENT_NO_GA_TEST_SED_PATTERN=^\#EXPERIMENT_NO_GA.*\n
+  EXPERIMENT_NO_GA_TEST_SED_PATTERN=/^\#EXPERIMENT_NO_GA/d
 endif
 
 ifeq ($(HTTPS_TEST),1)
   # remove prefix
-  HTTPS_TEST_SED_PATTERN=^\#HTTPS
+  HTTPS_TEST_SED_PATTERN=s/^\#HTTPS//
 else
   # remove whole line
-  HTTPS_TEST_SED_PATTERN=^\#HTTPS.*\n
+  HTTPS_TEST_SED_PATTERN=/^\#HTTPS/d
 endif
 
 ifeq ($(ALL_DIRECTIVES_TEST),1)
   # remove prefix
-  ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES
+  ALL_DIRECTIVES_TEST_SED_PATTERN=s/^\#ALL_DIRECTIVES//
 else
   # remove whole line
-  ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES.*\n
+  ALL_DIRECTIVES_TEST_SED_PATTERN=/^\#ALL_DIRECTIVES/d
 endif
 
 ifeq ($(PER_VHOST_STATS_TEST),1)
   # remove prefix
-  PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS
+  PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#PER_VHOST_STATS//
 else
   # remove whole line
-  PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS.*\n
+  PER_VHOST_STATS_TEST_SED_PATTERN=/^\#PER_VHOST_STATS/d
 endif
 
 ifeq ($(NO_PER_VHOST_STATS_TEST),1)
   # remove prefix
-  NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS
+  NO_PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#NO_PER_VHOST_STATS//
 else
   # remove whole line
-  NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS.*\n
+  NO_PER_VHOST_STATS_TEST_SED_PATTERN=/^\#NO_PER_VHOST_STATS/d
 endif
 
 ifeq ($(STATS_LOGGING_TEST),1)
   # remove prefix
-  STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING
+  STATS_LOGGING_TEST_SED_PATTERN=s/^\#STATS_LOGGING//
 else
   # remove whole line
-  STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING.*\n
+  STATS_LOGGING_TEST_SED_PATTERN=/^\#STATS_LOGGING/d
 endif
 
 # Note that the quoted sed replacement for APACHE_SLURP_DIR_COMMAND is because
@@ -381,27 +381,27 @@
 	    -e "s@# ModPagespeedSlurpReadOnly on@$(APACHE_SLURP_READ_ONLY_COMMAND)@g" \
 	    -e "s|@@TMP_SLURP_DIR@@|$(TMP_SLURP_DIR)|g" \
 	    -e "s|@@MEMCACHED_PORT@@|$(MEMCACHED_PORT)|g" \
-	    -e "s@$(STRESS_TEST_SED_PATTERN)@@" \
-	    -e "s@$(REWRITE_TEST_SED_PATTERN)@@" \
-	    -e "s@$(COVERAGE_TEST_SED_PATTERN)@@" \
-	    -e "s@$(PROXY_TEST_SED_PATTERN)@@" \
-	    -e "s@$(SLURP_TEST_SED_PATTERN)@@" \
-	    -e "s@$(SHARED_MEM_LOCK_TEST_SED_PATTERN)@@" \
-	    -e "s@$(SPELING_TEST_SED_PATTERN)@@" \
-	    -e "s@$(MEMCACHED_TEST_SED_PATTERN)@@" \
-	    -e "s@$(IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN)@@" \
-	    -e "s@$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)@@" \
-	    -e "s@$(PURGING_COVERAGE_TEST_SED_PATTERN)@@" \
-	    -e "s@$(IUR_COVERAGE_TEST_SED_PATTERN)@@" \
-	    -e "s@$(DOMAIN_AUTH_SED_PATTERN)@@" \
-	    -e "s@$(GZIP_TEST_SED_PATTERN)@@" \
-	    -e "s@$(HTTPS_TEST_SED_PATTERN)@@" \
-	    -e "s@$(EXPERIMENT_GA_TEST_SED_PATTERN)@@" \
-	    -e "s@$(EXPERIMENT_NO_GA_TEST_SED_PATTERN)@@" \
-	    -e "s@$(ALL_DIRECTIVES_TEST_SED_PATTERN)@@" \
-	    -e "s@$(PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
-	    -e "s@$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
-	    -e "s@$(STATS_LOGGING_TEST_SED_PATTERN)@@" \
+	    -e "$(STRESS_TEST_SED_PATTERN)" \
+	    -e "$(REWRITE_TEST_SED_PATTERN)" \
+	    -e "$(COVERAGE_TEST_SED_PATTERN)" \
+	    -e "$(PROXY_TEST_SED_PATTERN)" \
+	    -e "$(SLURP_TEST_SED_PATTERN)" \
+	    -e "$(SHARED_MEM_LOCK_TEST_SED_PATTERN)" \
+	    -e "$(SPELING_TEST_SED_PATTERN)" \
+	    -e "$(MEMCACHED_TEST_SED_PATTERN)" \
+	    -e "$(IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN)" \
+	    -e "$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)" \
+	    -e "$(PURGING_COVERAGE_TEST_SED_PATTERN)" \
+	    -e "$(IUR_COVERAGE_TEST_SED_PATTERN)" \
+	    -e "$(DOMAIN_AUTH_SED_PATTERN)" \
+	    -e "$(GZIP_TEST_SED_PATTERN)" \
+	    -e "$(HTTPS_TEST_SED_PATTERN)" \
+	    -e "$(EXPERIMENT_GA_TEST_SED_PATTERN)" \
+	    -e "$(EXPERIMENT_NO_GA_TEST_SED_PATTERN)" \
+	    -e "$(ALL_DIRECTIVES_TEST_SED_PATTERN)" \
+	    -e "$(PER_VHOST_STATS_TEST_SED_PATTERN)" \
+	    -e "$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)" \
+	    -e "$(STATS_LOGGING_TEST_SED_PATTERN)" \
 		$^ > $@
 	! grep '@@' $@  # Make sure we don't have any remaining @@variables@@
Commit	Line	Data
1a9213c5 ER	1	https://code.google.com/p/modpagespeed/issues/detail?id=632
1a9213c5 ER	2
ffebf8bc ER	3	patterns used (vim):
	4
	5	update pattern to remove prefixes
	6	:%s,\^\\#\([A-Z_]*\)$,s/&//,
	7
	8	update pattern to remove whole lines:
	9	:%s,\^\\#\([A-Z_]\)\.\\\n,/^\\#\1/d,
	10
	11	update subst lines
	12	:%s#-e "s@\$(\([A-Z_]*_PATTERN\))@@"#-e "$(\1)"#
	13
	14	--- modpagespeed-1.8.31.5/install/Makefile~ 2014-12-14 16:05:55.000000000 +0200
	15	+++ modpagespeed-1.8.31.5/install/Makefile 2014-12-14 16:12:55.900374377 +0200
	16	@@ -190,176 +190,176 @@
1a9213c5 ER	17
	18	ifeq ($(STRESS_TEST),1)
	19	# remove prefix
	20	- STRESS_TEST_SED_PATTERN=^\#STRESS
	21	+ STRESS_TEST_SED_PATTERN=s/^\#STRESS//
	22	else
	23	# remove whole line
	24	- STRESS_TEST_SED_PATTERN=^\#STRESS.*\n
	25	+ STRESS_TEST_SED_PATTERN=/^\#STRESS/d
	26	endif
	27
	28	ifeq ($(REWRITE_TEST),1)
ce5a7d18 ER	29	# remove prefix
	30	- REWRITE_TEST_SED_PATTERN=^\#REWRITE
	31	+ REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
	32	else
	33	# remove whole line
	34	- REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
	35	+ REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
	36	endif
1a9213c5 ER	37
	38	ifeq ($(COVERAGE_TRACE_TEST),1)
	39	# remove coverage prefix
	40	- COVERAGE_TEST_SED_PATTERN=^\#COVERAGE
	41	+ COVERAGE_TEST_SED_PATTERN=s/^\#COVERAGE//
	42	else
	43	# remove coverage lines
	44	- COVERAGE_TEST_SED_PATTERN=^\#COVERAGE.*\n
	45	+ COVERAGE_TEST_SED_PATTERN=/^\#COVERAGE/d
	46	endif
	47
	48	ifeq ($(PROXY_TEST),1)
	49	# remove prefix
	50	- PROXY_TEST_SED_PATTERN=^\#PROXY
	51	+ PROXY_TEST_SED_PATTERN=s/^\#PROXY//
	52	else
	53	# remove whole line
	54	- PROXY_TEST_SED_PATTERN=^\#PROXY.*\n
	55	+ PROXY_TEST_SED_PATTERN=/^\#PROXY/d
	56	endif
	57
	58	ifeq ($(SLURP_TEST),1)
	59	# remove prefix
	60	- SLURP_TEST_SED_PATTERN=^\#SLURP
	61	+ SLURP_TEST_SED_PATTERN=s/^\#SLURP//
	62	else
	63	# remove whole line
	64	- SLURP_TEST_SED_PATTERN=^\#SLURP.*\n
	65	+ SLURP_TEST_SED_PATTERN=/^\#SLURP/d
	66	endif
	67
	68	ifeq ($(SHARED_MEM_LOCK_TEST),1)
	69	# remove prefix
	70	- SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS
	71	+ SHARED_MEM_LOCK_TEST_SED_PATTERN=s/^\#SHARED_MEM_LOCKS//
	72	else
	73	# remove whole line
	74	- SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS.*\n
	75	+ SHARED_MEM_LOCK_TEST_SED_PATTERN=/^\#SHARED_MEM_LOCKS/d
	76	endif
	77
	78	ifeq ($(MEMCACHED_TEST),1)
	79	# remove prefix
	80	- MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED
	81	+ MEMCACHED_TEST_SED_PATTERN=s/^\#MEMCACHED//
	82	else
	83	# remove whole line
	84	- MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED.*\n
	85	+ MEMCACHED_TEST_SED_PATTERN=/^\#MEMCACHED/d
	86	endif
	87
ffebf8bc ER	88	ifeq ($(IPRO_PRESERVE_COVERAGE_TEST),1)
	89	# remove prefix
	90	- IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=^\#IPRO_PRESERVE_COVERAGE
	91	+ IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=s/^\#IPRO_PRESERVE_COVERAGE//
	92	else
	93	# remove whole line
	94	- IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=^\#IPRO_PRESERVE_COVERAGE.*\n
	95	+ IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=/^\#IPRO_PRESERVE_COVERAGE/d
	96	endif
	97
1a9213c5 ER	98	ifeq ($(MEMCACHE_COVERAGE_TEST),1)
	99	# remove prefix
	100	- MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE
	101	+ MEMCACHE_COVERAGE_TEST_SED_PATTERN=s/^\#MEMCACHE_COVERAGE//
	102	else
	103	# remove whole line
	104	- MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE.*\n
	105	+ MEMCACHE_COVERAGE_TEST_SED_PATTERN=/^\#MEMCACHE_COVERAGE/d
	106	endif
	107
ce5a7d18 ER	108	ifeq ($(PURGING_COVERAGE_TEST),1)
	109	# remove prefix
	110	- PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE
	111	+ PURGING_COVERAGE_TEST_SED_PATTERN=s/^\#PURGING_COVERAGE//
	112	else
	113	# remove whole line
	114	- PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE.*\n
	115	+ PURGING_COVERAGE_TEST_SED_PATTERN=/^\#PURGING_COVERAGE/d
	116	endif
	117
ffebf8bc ER	118	ifeq ($(IUR_COVERAGE_TEST),1)
	119	# remove prefix
	120	- IUR_COVERAGE_TEST_SED_PATTERN=^\#IUR_COVERAGE
	121	+ IUR_COVERAGE_TEST_SED_PATTERN=s/^\#IUR_COVERAGE//
	122	# remove whole explicit domain authorization line
	123	- DOMAIN_AUTH_SED_PATTERN=^\#DOMAIN_AUTH_COVERAGE.*\n
	124	+ DOMAIN_AUTH_SED_PATTERN=/^\#DOMAIN_AUTH_COVERAGE/d
	125	else
	126	# remove whole line
	127	- IUR_COVERAGE_TEST_SED_PATTERN=^\#IUR_COVERAGE.*\n
	128	+ IUR_COVERAGE_TEST_SED_PATTERN=/^\#IUR_COVERAGE/d
	129	ifeq ($(COVERAGE_TRACE_TEST),1)
	130	# remove prefix for explicit domain authorization line
	131	- DOMAIN_AUTH_SED_PATTERN=^\#DOMAIN_AUTH_COVERAGE
	132	+ DOMAIN_AUTH_SED_PATTERN=s/^\#DOMAIN_AUTH_COVERAGE//
	133	endif
	134	endif
	135
1a9213c5 ER	136	ifeq ($(SPELING_TEST),1)
	137	# remove prefix
	138	- SPELING_TEST_SED_PATTERN=^\#SPELING
	139	+ SPELING_TEST_SED_PATTERN=s/^\#SPELING//
	140	else
	141	# remove whole line
	142	- SPELING_TEST_SED_PATTERN=^\#SPELING.*\n
	143	+ SPELING_TEST_SED_PATTERN=/^\#SPELING/d
	144	endif
	145
	146	ifeq ($(REWRITE_TEST),1)
	147	# remove prefix
	148	- REWRITE_TEST_SED_PATTERN=^\#REWRITE
	149	+ REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
	150	else
	151	# remove whole line
	152	- REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
	153	+ REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
	154	endif
	155
	156	ifeq ($(GZIP_TEST),1)
	157	# remove prefix
	158	- GZIP_TEST_SED_PATTERN=^\#GZIP
	159	+ GZIP_TEST_SED_PATTERN=s/^\#GZIP//
	160	else
	161	# remove whole line
	162	- GZIP_TEST_SED_PATTERN=^\#GZIP.*\n
	163	+ GZIP_TEST_SED_PATTERN=/^\#GZIP/d
	164	endif
	165
ffebf8bc	166	ifeq ($(EXPERIMENT_GA_TEST),1)
1a9213c5	167	# remove prefix
ffebf8bc ER	168	- EXPERIMENT_GA_TEST_SED_PATTERN=^\#EXPERIMENT_GA
ffebf8bc ER	169	+ EXPERIMENT_GA_TEST_SED_PATTERN=s/^\#EXPERIMENT_GA//
1a9213c5 ER	170	else
1a9213c5 ER	171	# remove whole line
ffebf8bc ER	172	- EXPERIMENT_GA_TEST_SED_PATTERN=^\#EXPERIMENT_GA.*\n
ffebf8bc ER	173	+ EXPERIMENT_GA_TEST_SED_PATTERN=/^\#EXPERIMENT_GA/d
1a9213c5 ER	174	endif
1a9213c5 ER	175
ffebf8bc	176	ifeq ($(EXPERIMENT_NO_GA_TEST),1)
1a9213c5	177	# remove prefix
ffebf8bc ER	178	- EXPERIMENT_NO_GA_TEST_SED_PATTERN=^\#EXPERIMENT_NO_GA
ffebf8bc ER	179	+ EXPERIMENT_NO_GA_TEST_SED_PATTERN=s/^\#EXPERIMENT_NO_GA//
1a9213c5 ER	180	else
1a9213c5 ER	181	# remove whole line
ffebf8bc ER	182	- EXPERIMENT_NO_GA_TEST_SED_PATTERN=^\#EXPERIMENT_NO_GA.*\n
ffebf8bc ER	183	+ EXPERIMENT_NO_GA_TEST_SED_PATTERN=/^\#EXPERIMENT_NO_GA/d
1a9213c5 ER	184	endif
	185
	186	ifeq ($(HTTPS_TEST),1)
	187	# remove prefix
	188	- HTTPS_TEST_SED_PATTERN=^\#HTTPS
	189	+ HTTPS_TEST_SED_PATTERN=s/^\#HTTPS//
	190	else
	191	# remove whole line
	192	- HTTPS_TEST_SED_PATTERN=^\#HTTPS.*\n
	193	+ HTTPS_TEST_SED_PATTERN=/^\#HTTPS/d
	194	endif
	195
	196	ifeq ($(ALL_DIRECTIVES_TEST),1)
	197	# remove prefix
	198	- ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES
	199	+ ALL_DIRECTIVES_TEST_SED_PATTERN=s/^\#ALL_DIRECTIVES//
	200	else
	201	# remove whole line
	202	- ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES.*\n
	203	+ ALL_DIRECTIVES_TEST_SED_PATTERN=/^\#ALL_DIRECTIVES/d
	204	endif
	205
	206	ifeq ($(PER_VHOST_STATS_TEST),1)
	207	# remove prefix
	208	- PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS
	209	+ PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#PER_VHOST_STATS//
	210	else
	211	# remove whole line
	212	- PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS.*\n
	213	+ PER_VHOST_STATS_TEST_SED_PATTERN=/^\#PER_VHOST_STATS/d
	214	endif
	215
	216	ifeq ($(NO_PER_VHOST_STATS_TEST),1)
	217	# remove prefix
	218	- NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS
	219	+ NO_PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#NO_PER_VHOST_STATS//
	220	else
	221	# remove whole line
	222	- NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS.*\n
	223	+ NO_PER_VHOST_STATS_TEST_SED_PATTERN=/^\#NO_PER_VHOST_STATS/d
	224	endif
	225
	226	ifeq ($(STATS_LOGGING_TEST),1)
	227	# remove prefix
	228	- STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING
	229	+ STATS_LOGGING_TEST_SED_PATTERN=s/^\#STATS_LOGGING//
	230	else
	231	# remove whole line
	232	- STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING.*\n
	233	+ STATS_LOGGING_TEST_SED_PATTERN=/^\#STATS_LOGGING/d
	234	endif
	235
	236	# Note that the quoted sed replacement for APACHE_SLURP_DIR_COMMAND is because
ffebf8bc	237	@@ -381,27 +381,27 @@
1a9213c5 ER	238	-e "s@# ModPagespeedSlurpReadOnly on@$(APACHE_SLURP_READ_ONLY_COMMAND)@g" \
1a9213c5 ER	239	-e "s\|@@TMP_SLURP_DIR@@\|$(TMP_SLURP_DIR)\|g" \
ffebf8bc	240	-e "s\|@@MEMCACHED_PORT@@\|$(MEMCACHED_PORT)\|g" \
1a9213c5 ER	241	- -e "s@$(STRESS_TEST_SED_PATTERN)@@" \
	242	- -e "s@$(REWRITE_TEST_SED_PATTERN)@@" \
	243	- -e "s@$(COVERAGE_TEST_SED_PATTERN)@@" \
	244	- -e "s@$(PROXY_TEST_SED_PATTERN)@@" \
	245	- -e "s@$(SLURP_TEST_SED_PATTERN)@@" \
	246	- -e "s@$(SHARED_MEM_LOCK_TEST_SED_PATTERN)@@" \
	247	- -e "s@$(SPELING_TEST_SED_PATTERN)@@" \
	248	- -e "s@$(MEMCACHED_TEST_SED_PATTERN)@@" \
ffebf8bc	249	- -e "s@$(IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN)@@" \
1a9213c5	250	- -e "s@$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)@@" \
ce5a7d18	251	- -e "s@$(PURGING_COVERAGE_TEST_SED_PATTERN)@@" \
ffebf8bc ER	252	- -e "s@$(IUR_COVERAGE_TEST_SED_PATTERN)@@" \
ffebf8bc ER	253	- -e "s@$(DOMAIN_AUTH_SED_PATTERN)@@" \
1a9213c5 ER	254	- -e "s@$(GZIP_TEST_SED_PATTERN)@@" \
1a9213c5 ER	255	- -e "s@$(HTTPS_TEST_SED_PATTERN)@@" \
ffebf8bc ER	256	- -e "s@$(EXPERIMENT_GA_TEST_SED_PATTERN)@@" \
ffebf8bc ER	257	- -e "s@$(EXPERIMENT_NO_GA_TEST_SED_PATTERN)@@" \
1a9213c5 ER	258	- -e "s@$(ALL_DIRECTIVES_TEST_SED_PATTERN)@@" \
	259	- -e "s@$(PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
	260	- -e "s@$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
	261	- -e "s@$(STATS_LOGGING_TEST_SED_PATTERN)@@" \
	262	+ -e "$(STRESS_TEST_SED_PATTERN)" \
	263	+ -e "$(REWRITE_TEST_SED_PATTERN)" \
	264	+ -e "$(COVERAGE_TEST_SED_PATTERN)" \
	265	+ -e "$(PROXY_TEST_SED_PATTERN)" \
	266	+ -e "$(SLURP_TEST_SED_PATTERN)" \
	267	+ -e "$(SHARED_MEM_LOCK_TEST_SED_PATTERN)" \
	268	+ -e "$(SPELING_TEST_SED_PATTERN)" \
	269	+ -e "$(MEMCACHED_TEST_SED_PATTERN)" \
ffebf8bc	270	+ -e "$(IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN)" \
1a9213c5	271	+ -e "$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)" \
ce5a7d18	272	+ -e "$(PURGING_COVERAGE_TEST_SED_PATTERN)" \
ffebf8bc ER	273	+ -e "$(IUR_COVERAGE_TEST_SED_PATTERN)" \
ffebf8bc ER	274	+ -e "$(DOMAIN_AUTH_SED_PATTERN)" \
1a9213c5 ER	275	+ -e "$(GZIP_TEST_SED_PATTERN)" \
1a9213c5 ER	276	+ -e "$(HTTPS_TEST_SED_PATTERN)" \
ffebf8bc ER	277	+ -e "$(EXPERIMENT_GA_TEST_SED_PATTERN)" \
ffebf8bc ER	278	+ -e "$(EXPERIMENT_NO_GA_TEST_SED_PATTERN)" \
1a9213c5 ER	279	+ -e "$(ALL_DIRECTIVES_TEST_SED_PATTERN)" \
	280	+ -e "$(PER_VHOST_STATS_TEST_SED_PATTERN)" \
	281	+ -e "$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)" \
	282	+ -e "$(STATS_LOGGING_TEST_SED_PATTERN)" \
	283	$^ > $@
	284	! grep '@@' $@ # Make sure we don't have any remaining @@variables@@
	285