Now that we've dropped support for DJGPP, Windows 95/98/ME and MS-DOS, that should always the case.
This change is basically a backport of Automake-NG commit 'v1.12-342-ge6af355'. * lib/am/texibuild.am: Just assume we can have directories whose name starts with a dot, i.e., that '${am__leading_dot}' expands to '.'. * automake.in (require_build_directory): Likewise. * m4/depend.m4 (AM_SET_DEPDIR): Likewise. Now $(DEPDIR) will be set unconditionally to '.deps'. * m4/init.m4 (AM_INIT_AUTOMAKE): Don't AC_REQUIRE the m4 macro 'AM_SET_LEADING_DOT' anymore. * m4/lead-dot.m4: Delete. * Makefile.am (dist_automake_ac_DATA): Remove it. * t/subobj11a.sh: Just assume $(DEPDIR) expands to '.deps'. Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- Makefile.am | 1 - automake.in | 3 +-- lib/am/texibuild.am | 2 +- m4/depend.m4 | 5 +---- m4/init.m4 | 1 - m4/lead-dot.m4 | 19 ------------------- t/subobj11a.sh | 10 ++-------- 7 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 m4/lead-dot.m4 diff --git a/Makefile.am b/Makefile.am index 0a37d9f..7ad0e1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,7 +275,6 @@ dist_automake_ac_DATA = \ m4/gcj.m4 \ m4/init.m4 \ m4/install-sh.m4 \ - m4/lead-dot.m4 \ m4/lex.m4 \ m4/lispdir.m4 \ m4/maintainer.m4 \ diff --git a/automake.in b/automake.in index 2ed64fb..6a12195 100644 --- a/automake.in +++ b/automake.in @@ -7723,8 +7723,7 @@ sub require_build_directory ($) $directory_map{$cdir} = $dirstamp; # Set a variable for the dirstamp basename. - define_pretty_variable ('am__dirstamp', TRUE, INTERNAL, - '$(am__leading_dot)dirstamp'); + define_pretty_variable ('am__dirstamp', TRUE, INTERNAL, '.dirstamp'); # Directory must be removed by 'make distclean'. $clean_files{$dirstamp} = DIST_CLEAN; diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index b60a3c9..09a8765 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -30,7 +30,7 @@ ## 2) If the texinfo file has some minor mistakes which cause makeinfo ## to fail, the info files are not removed. (They are needed by the ## developer while he writes documentation.) - %AM_V_MAKEINFO%restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + %AM_V_MAKEINFO%restore=: && backupdir=.am$$$$ && \ ?INSRC? am__cwd=`pwd` && $(am__cd) $(srcdir) && \ rm -rf $$backupdir && mkdir $$backupdir && \ ## If makeinfo is not installed we must not backup the files so diff --git a/m4/depend.m4 b/m4/depend.m4 index cd93061..0bbe7fa 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -160,10 +160,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # ------------- # Choose a directory name for dependency files. # This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +AC_DEFUN([AM_SET_DEPDIR], [AC_SUBST([DEPDIR], [.deps])]) # AM_DEP_TRACK diff --git a/m4/init.m4 b/m4/init.m4 index fc05148..7804c8b 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -88,7 +88,6 @@ AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])]) diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4 deleted file mode 100644 index 633694f..0000000 --- a/m4/lead-dot.m4 +++ /dev/null @@ -1,19 +0,0 @@ -## -*- Autoconf -*- -# Copyright (C) 2003-2012 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) diff --git a/t/subobj11a.sh b/t/subobj11a.sh index 4bd8863..130b2ae 100755 --- a/t/subobj11a.sh +++ b/t/subobj11a.sh @@ -57,14 +57,8 @@ $AUTOMAKE -a ./configure --enable-dependency-tracking -depdir=$(sed -n 's/^ *DEPDIR *= *//p' Makefile) -if test x"$depdir" != x; then - depdir=src/$depdir -else - echo "$me: cannot extract value of DEPDIR from Makefile" >&2 - exit 1 -fi - +$MAKE +depdir=src/.deps ls -l "$depdir" test -f "$depdir"/foo.Po -- 1.8.0.1.409.g252f922