diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-28 13:23:16 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-30 21:51:52 +0100 |
| commit | ef20e28bf3b966bf4f0358099f38b70a30c12755 (patch) | |
| tree | ab364b09f6c700344f6e98cd3c4e35315bf3f2f5 /Makefile.am | |
| parent | 25d3adb1b25132d5051dd97dacc707d2f3375a90 (diff) | |
| download | automake-ef20e28bf3b966bf4f0358099f38b70a30c12755.tar.gz | |
maintcheck: fix real and spurious warnings
* lib/Makefile.am (install-data-hook): Correctly quote $(DESTDIR)
occurrences.
* Makefile.am (install-exec-hook, uninstall-hook): Likewise.
(autodiffs): Prefer '$(am__cd)' to plain 'cd', where warranted.
* doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Likewise. Also,
prefer using AC_SUBST'd $(abs_top_builddir) over obtaining it at
runtime from $(top_builddir).
* syntax-check.mk (sc_mkinstalldirs): Tweak to whitelist known
harmless occurrences of the checked-against usages.
(sc_no_for_variable_in_macro): Likewise.
* tests/CheckListOfTests.am (maintainer-check-list-of-tests): Tweak
to avoid spuriously triggering the 'sc_no_for_variable_in_macro'
maintainer check. Prefer '$(am__cd)' to plain 'cd' when warranted.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 20a3584d7..685cbd95c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,16 +56,16 @@ install-exec-hook: @for p in $(bin_SCRIPTS); do \ f="`echo $$p|sed '$(transform)'`"; \ fv="$$f-$(APIVERSION)"; \ - rm -f $(DESTDIR)$(bindir)/$$fv; \ - echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \ - $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \ + rm -f "$(DESTDIR)$(bindir)/$$fv"; \ + echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \ + $(LN) "$(DESTDIR)$(bindir)/$$f" "$(DESTDIR)$(bindir)/$$fv"; \ done uninstall-hook: @for p in $(bin_SCRIPTS); do \ f="`echo $$p|sed '$(transform)'`"; \ fv="$$f-$(APIVERSION)"; \ - rm -f $(DESTDIR)$(bindir)/$$fv; \ + rm -f "$(DESTDIR)$(bindir)/$$fv"; \ done @@ -233,14 +233,14 @@ autodiffs: rev=$$1 dir=$$2 \ && echo "$@: will get files from revision $$rev" \ && git clone -q --depth 1 "$$am_gitdir" tmp \ - && cd tmp \ + && $(am__cd) tmp \ && git checkout -q "$$rev" \ && echo "$@: bootstrapping $$rev" \ && $(SHELL) ./bootstrap \ && echo "$@: copying files from $$rev" \ && makefile_ins=`find . -name Makefile.in` \ && (tar cf - configure aclocal.m4 $$makefile_ins) | \ - (cd .. && cd "$$dir" && tar xf -) \ + (cd .. && $(am__cd) "$$dir" && tar xf -) \ && cd .. \ && rm -rf tmp; \ }; \ @@ -250,7 +250,7 @@ autodiffs: && git --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \ && rm -rf $$outdir \ && mkdir $$outdir \ - && cd $$outdir \ + && $(am__cd) $$outdir \ && mkdir new old \ && get_autofiles_from_rev $$OLD_COMMIT old \ && get_autofiles_from_rev $$NEW_COMMIT new \ |