diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-31 16:40:20 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-31 16:40:20 -0700 |
| commit | 323dabef4b3570798e2d9daedbba9b98e9d7a504 (patch) | |
| tree | 4fa1198989b4353db8a6fb1ee54a5b37dcc77fc1 | |
| parent | 0f5e166e42cb3873b4073600198278b6e3363dbc (diff) | |
| parent | 13f00eb4493c217269b76614759e452d8302955e (diff) | |
| download | automake-323dabef4b3570798e2d9daedbba9b98e9d7a504.tar.gz | |
Merge branch 'micro' into minor
| -rw-r--r-- | bin/automake.in | 2 | ||||
| -rw-r--r-- | lib/am/distdir.am | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/bin/automake.in b/bin/automake.in index 355d7ff30..09a1c956b 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker sub substitute_ac_subst_variables { my ($text) = @_; - $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; + $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; return $text; } diff --git a/lib/am/distdir.am b/lib/am/distdir.am index d4dd8cc9b..87c6730f5 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -309,6 +309,16 @@ endif %?TOPDIR_P% ## We order DIST_TARGETS by expected duration of the compressors, ## slowest first, for better parallelism in "make dist". Do not ## reorder DIST_ARCHIVES, users may expect gzip to be first. +## +## Traditionally, gzip prepended the contents of the GZIP environment +## variable to its arguments, and the commands below formerly used +## this by invoking 'GZIP=$(GZIP_ENV) gzip'. The GZIP environment +## variable is now considered to be obsolescent, so the commands below +## now use 'eval GZIP= gzip $(GZIP_ENV)' instead; this should work +## with both older and newer gzip implementations. The 'eval' is to +## support makefile assignments like 'GZIP_ENV = "-9 -n"' that quote +## the GZIP_ENV right-hand side because that was needed with the +## former invocation pattern. if %?TOPDIR_P% @@ -316,7 +326,7 @@ if %?TOPDIR_P% GZIP_ENV = --best .PHONY: dist-gzip dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2 @@ -352,7 +362,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) ?ZIP?DIST_ARCHIVES += $(distdir).zip @@ -412,7 +422,7 @@ endif %?SUBDIRS% distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -422,7 +432,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac |