bug-632.patch

   1 https://code.google.com/p/modpagespeed/issues/detail?id=632
   2
   3 --- modpagespeed/src/install/Makefile~  2013-03-02 13:19:46.590881666 +0200
   4 +++ modpagespeed/src/install/Makefile   2013-03-02 13:56:57.010557918 +0200
   5 @@ -180,10 +180,10 @@
   6
   7  ifeq ($(STRESS_TEST),1)
   8    # remove prefix
   9 -  STRESS_TEST_SED_PATTERN=^\#STRESS
  10 +  STRESS_TEST_SED_PATTERN=s/^\#STRESS//
  11  else
  12    # remove whole line
  13 -  STRESS_TEST_SED_PATTERN=^\#STRESS.*\n
  14 +  STRESS_TEST_SED_PATTERN=/^\#STRESS/d
  15  endif
  16
  17  ifeq ($(REWRITE_TEST),1)
  18 @@ -196,130 +196,130 @@
  19
  20  ifeq ($(COVERAGE_TRACE_TEST),1)
  21    # remove coverage prefix
  22 -  COVERAGE_TEST_SED_PATTERN=^\#COVERAGE
  23 +  COVERAGE_TEST_SED_PATTERN=s/^\#COVERAGE//
  24  else
  25    # remove coverage lines
  26 -  COVERAGE_TEST_SED_PATTERN=^\#COVERAGE.*\n
  27 +  COVERAGE_TEST_SED_PATTERN=/^\#COVERAGE/d
  28  endif
  29
  30  ifeq ($(PROXY_TEST),1)
  31    # remove prefix
  32 -  PROXY_TEST_SED_PATTERN=^\#PROXY
  33 +  PROXY_TEST_SED_PATTERN=s/^\#PROXY//
  34  else
  35    # remove whole line
  36 -  PROXY_TEST_SED_PATTERN=^\#PROXY.*\n
  37 +  PROXY_TEST_SED_PATTERN=/^\#PROXY/d
  38  endif
  39
  40  ifeq ($(SLURP_TEST),1)
  41    # remove prefix
  42 -  SLURP_TEST_SED_PATTERN=^\#SLURP
  43 +  SLURP_TEST_SED_PATTERN=s/^\#SLURP//
  44  else
  45    # remove whole line
  46 -  SLURP_TEST_SED_PATTERN=^\#SLURP.*\n
  47 +  SLURP_TEST_SED_PATTERN=/^\#SLURP/d
  48  endif
  49
  50  ifeq ($(SHARED_MEM_LOCK_TEST),1)
  51    # remove prefix
  52 -  SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS
  53 +  SHARED_MEM_LOCK_TEST_SED_PATTERN=s/^\#SHARED_MEM_LOCKS//
  54  else
  55    # remove whole line
  56 -  SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS.*\n
  57 +  SHARED_MEM_LOCK_TEST_SED_PATTERN=/^\#SHARED_MEM_LOCKS/d
  58  endif
  59
  60  ifeq ($(MEMCACHED_TEST),1)
  61    # remove prefix
  62 -  MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED
  63 +  MEMCACHED_TEST_SED_PATTERN=s/^\#MEMCACHED//
  64  else
  65    # remove whole line
  66 -  MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED.*\n
  67 +  MEMCACHED_TEST_SED_PATTERN=/^\#MEMCACHED/d
  68  endif
  69
  70  ifeq ($(MEMCACHE_COVERAGE_TEST),1)
  71    # remove prefix
  72 -  MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE
  73 +  MEMCACHE_COVERAGE_TEST_SED_PATTERN=s/^\#MEMCACHE_COVERAGE//
  74  else
  75    # remove whole line
  76 -  MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE.*\n
  77 +  MEMCACHE_COVERAGE_TEST_SED_PATTERN=/^\#MEMCACHE_COVERAGE/d
  78  endif
  79
  80  ifeq ($(SPELING_TEST),1)
  81    # remove prefix
  82 -  SPELING_TEST_SED_PATTERN=^\#SPELING
  83 +  SPELING_TEST_SED_PATTERN=s/^\#SPELING//
  84  else
  85    # remove whole line
  86 -  SPELING_TEST_SED_PATTERN=^\#SPELING.*\n
  87 +  SPELING_TEST_SED_PATTERN=/^\#SPELING/d
  88  endif
  89
  90  ifeq ($(REWRITE_TEST),1)
  91    # remove prefix
  92 -  REWRITE_TEST_SED_PATTERN=^\#REWRITE
  93 +  REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
  94  else
  95    # remove whole line
  96 -  REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
  97 +  REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
  98  endif
  99
 100  ifeq ($(GZIP_TEST),1)
 101    # remove prefix
 102 -  GZIP_TEST_SED_PATTERN=^\#GZIP
 103 +  GZIP_TEST_SED_PATTERN=s/^\#GZIP//
 104  else
 105    # remove whole line
 106 -  GZIP_TEST_SED_PATTERN=^\#GZIP.*\n
 107 +  GZIP_TEST_SED_PATTERN=/^\#GZIP/d
 108  endif
 109
 110  ifeq ($(FURIOUS_GA_TEST),1)
 111    # remove prefix
 112 -  FURIOUS_GA_TEST_SED_PATTERN=^\#FURIOUS_GA
 113 +  FURIOUS_GA_TEST_SED_PATTERN=s/^\#FURIOUS_GA//
 114  else
 115    # remove whole line
 116 -  FURIOUS_GA_TEST_SED_PATTERN=^\#FURIOUS_GA.*\n
 117 +  FURIOUS_GA_TEST_SED_PATTERN=/^\#FURIOUS_GA/d
 118  endif
 119
 120  ifeq ($(FURIOUS_NO_GA_TEST),1)
 121    # remove prefix
 122 -  FURIOUS_NO_GA_TEST_SED_PATTERN=^\#FURIOUS_NO_GA
 123 +  FURIOUS_NO_GA_TEST_SED_PATTERN=s/^\#FURIOUS_NO_GA//
 124  else
 125    # remove whole line
 126 -  FURIOUS_NO_GA_TEST_SED_PATTERN=^\#FURIOUS_NO_GA.*\n
 127 +  FURIOUS_NO_GA_TEST_SED_PATTERN=/^\#FURIOUS_NO_GA/d
 128  endif
 129
 130  ifeq ($(HTTPS_TEST),1)
 131    # remove prefix
 132 -  HTTPS_TEST_SED_PATTERN=^\#HTTPS
 133 +  HTTPS_TEST_SED_PATTERN=s/^\#HTTPS//
 134  else
 135    # remove whole line
 136 -  HTTPS_TEST_SED_PATTERN=^\#HTTPS.*\n
 137 +  HTTPS_TEST_SED_PATTERN=/^\#HTTPS/d
 138  endif
 139
 140  ifeq ($(ALL_DIRECTIVES_TEST),1)
 141    # remove prefix
 142 -  ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES
 143 +  ALL_DIRECTIVES_TEST_SED_PATTERN=s/^\#ALL_DIRECTIVES//
 144  else
 145    # remove whole line
 146 -  ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES.*\n
 147 +  ALL_DIRECTIVES_TEST_SED_PATTERN=/^\#ALL_DIRECTIVES/d
 148  endif
 149
 150  ifeq ($(PER_VHOST_STATS_TEST),1)
 151    # remove prefix
 152 -  PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS
 153 +  PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#PER_VHOST_STATS//
 154  else
 155    # remove whole line
 156 -  PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS.*\n
 157 +  PER_VHOST_STATS_TEST_SED_PATTERN=/^\#PER_VHOST_STATS/d
 158  endif
 159
 160  ifeq ($(NO_PER_VHOST_STATS_TEST),1)
 161    # remove prefix
 162 -  NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS
 163 +  NO_PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#NO_PER_VHOST_STATS//
 164  else
 165    # remove whole line
 166 -  NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS.*\n
 167 +  NO_PER_VHOST_STATS_TEST_SED_PATTERN=/^\#NO_PER_VHOST_STATS/d
 168  endif
 169
 170  ifeq ($(STATS_LOGGING_TEST),1)
 171    # remove prefix
 172 -  STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING
 173 +  STATS_LOGGING_TEST_SED_PATTERN=s/^\#STATS_LOGGING//
 174  else
 175    # remove whole line
 176 -  STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING.*\n
 177 +  STATS_LOGGING_TEST_SED_PATTERN=/^\#STATS_LOGGING/d
 178  endif
 179
 180  # Note that the quoted sed replacement for APACHE_SLURP_DIR_COMMAND is because
 181 @@ -336,23 +336,23 @@
 182             -e "s@# ModPagespeedSlurpDirectory ...@$(APACHE_SLURP_DIR_COMMAND)@g" \
 183             -e "s@# ModPagespeedSlurpReadOnly on@$(APACHE_SLURP_READ_ONLY_COMMAND)@g" \
 184             -e "s|@@TMP_SLURP_DIR@@|$(TMP_SLURP_DIR)|g" \
 185 -           -e "s@$(STRESS_TEST_SED_PATTERN)@@" \
 186 -           -e "s@$(REWRITE_TEST_SED_PATTERN)@@" \
 187 -           -e "s@$(COVERAGE_TEST_SED_PATTERN)@@" \
 188 -           -e "s@$(PROXY_TEST_SED_PATTERN)@@" \
 189 -           -e "s@$(SLURP_TEST_SED_PATTERN)@@" \
 190 -           -e "s@$(SHARED_MEM_LOCK_TEST_SED_PATTERN)@@" \
 191 -           -e "s@$(SPELING_TEST_SED_PATTERN)@@" \
 192 -           -e "s@$(MEMCACHED_TEST_SED_PATTERN)@@" \
 193 -           -e "s@$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)@@" \
 194 -           -e "s@$(GZIP_TEST_SED_PATTERN)@@" \
 195 -           -e "s@$(HTTPS_TEST_SED_PATTERN)@@" \
 196 -           -e "s@$(FURIOUS_GA_TEST_SED_PATTERN)@@" \
 197 -           -e "s@$(FURIOUS_NO_GA_TEST_SED_PATTERN)@@" \
 198 -           -e "s@$(ALL_DIRECTIVES_TEST_SED_PATTERN)@@" \
 199 -           -e "s@$(PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
 200 -           -e "s@$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
 201 -           -e "s@$(STATS_LOGGING_TEST_SED_PATTERN)@@" \
 202 +           -e "$(STRESS_TEST_SED_PATTERN)" \
 203 +           -e "$(REWRITE_TEST_SED_PATTERN)" \
 204 +           -e "$(COVERAGE_TEST_SED_PATTERN)" \
 205 +           -e "$(PROXY_TEST_SED_PATTERN)" \
 206 +           -e "$(SLURP_TEST_SED_PATTERN)" \
 207 +           -e "$(SHARED_MEM_LOCK_TEST_SED_PATTERN)" \
 208 +           -e "$(SPELING_TEST_SED_PATTERN)" \
 209 +           -e "$(MEMCACHED_TEST_SED_PATTERN)" \
 210 +           -e "$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)" \
 211 +           -e "$(GZIP_TEST_SED_PATTERN)" \
 212 +           -e "$(HTTPS_TEST_SED_PATTERN)" \
 213 +           -e "$(FURIOUS_GA_TEST_SED_PATTERN)" \
 214 +           -e "$(FURIOUS_NO_GA_TEST_SED_PATTERN)" \
 215 +           -e "$(ALL_DIRECTIVES_TEST_SED_PATTERN)" \
 216 +           -e "$(PER_VHOST_STATS_TEST_SED_PATTERN)" \
 217 +           -e "$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)" \
 218 +           -e "$(STATS_LOGGING_TEST_SED_PATTERN)" \
 219                 $^ > $@
 220         ! grep '@@' $@  # Make sure we don't have any remaining @@variables@@
 221