diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-04 22:04:37 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-04 22:04:37 +0200 |
| commit | 1fb0f1cec8fec274adf8544879e7cab75e89adbc (patch) | |
| tree | 4788b32ad54df1b4b601ec420fd81fdf275cc809 /lib/am/configure.am | |
| parent | 01d84fa05fd62dc47f8cec378ebd9e2c21ddc92c (diff) | |
| download | automake-1fb0f1cec8fec274adf8544879e7cab75e89adbc.tar.gz | |
For all possibly-relative subdirs, use $(am__cd).
Up to now, $(am__cd) was only used within backquotes, to avoid
extraneous output. This patch also uses it for every `cd' to a
relative subdir, to prevent CDPATH from entering an unwanted
directory.
* Makefile.am (maintainer-check): Fix current check for
$(am__cd) within backquotes a bit. Add new check for `cd' to a
relative subdir.
* automake.in (handle_tags, handle_configure): Adjust rules.
* lib/am/ansi2knr.am: Likewise.
* lib/am/configure.am: Likewise.
* lib/am/distdir.am: Likewise.
* lib/am/remake-hdr.am: Likewise.
* lib/am/subdirs.am: Likewise.
* lib/am/tags.am: Likewise.
* lib/am/texibuild.am: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'lib/am/configure.am')
| -rw-r--r-- | lib/am/configure.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/am/configure.am b/lib/am/configure.am index 4623f4148..e24e9a6cb 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -40,7 +40,7 @@ endif %?TOPDIR_P% case '$(am__configure_deps)' in \ *$$dep*) \ ?TOPDIR_P? echo ' cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%'; \ -?TOPDIR_P? cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% \ +?TOPDIR_P? $(am__cd) $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% \ ?TOPDIR_P? && exit 0; \ ?!TOPDIR_P? ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ## If on the other hand, subdir/Makefile.in has been removed, then toplevel @@ -53,7 +53,7 @@ endif %?TOPDIR_P% done; \ ## Otherwise, rebuild only this file. echo ' cd $(top_srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%'; \ - cd $(top_srcdir) && \ + $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES% ## Ensure that GNU make doesn't remove Makefile if ./config.status (below) @@ -102,7 +102,7 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC ?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps) -?TOPDIR_P? cd $(srcdir) && $(AUTOCONF) +?TOPDIR_P? $(am__cd) $(srcdir) && $(AUTOCONF) ?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -119,7 +119,7 @@ $(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps) ## the $(am__configure_deps) dependency. if %?REGEN-ACLOCAL-M4% $(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps) -?TOPDIR_P? cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +?TOPDIR_P? $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ## Avoid the "deleted header file" problem for the dependencies. |