diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-28 16:59:47 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-28 16:59:47 +0200 |
| commit | c481ac95102bf739e7c95e0ec23a40b24bee7017 (patch) | |
| tree | 9e0bd7fb416d0213b80cf9e1b746dc6e37f63021 /lib/am | |
| parent | 93fcb730612dee65684862c41de1f287292abd2c (diff) | |
| parent | 68b42720afb1bc015592d7b70f0165d01e878b88 (diff) | |
| download | automake-c481ac95102bf739e7c95e0ec23a40b24bee7017.tar.gz | |
Merge branch 'master' into test-protocols
* master:
fix: regenerate Makefile.in files
maintcheck: fix usage of `cd' instead of `$(am__cd)'
Diffstat (limited to 'lib/am')
| -rw-r--r-- | lib/am/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/am/inst-vars.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 098a3d415..53ce53d41 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -99,7 +99,7 @@ am__uninstall_files_from_dir = { \ test -z "$$files" \ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - cd "$$dir" && rm -f $$files; }; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(amdir)" DATA = $(dist_am_DATA) diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am index 477513ff8..a807f79be 100644 --- a/lib/am/inst-vars.am +++ b/lib/am/inst-vars.am @@ -67,7 +67,7 @@ am__uninstall_files_from_dir = { \ ## is indeed desired and welcome (better to fail loudly thasn silently). || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - cd "$$dir" && rm -f $$files; }; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ } endif %?FIRST% |