general: assume dot-starting file names are supported

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.lattarini@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 0a37d9f7c39740b2fc1ba8073ba04b227a4bae83..7ad0e1fe41a718d501b779d6f83c89582e381a59 100644 (file)
--- 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 2ed64fbfee86f9dc87403d0e076986e654ff834f..6a121952b889cc8c5c78904c5ec8ee7585eceb6f 100644 (file)
--- 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 b60a3c95c64f8721c1781f3728b07553659319bf..09a8765c53648d009c049459f27f65452e8b6070 100644 (file)
--- 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 cd930617377b017dd34aa09a7777d3b7893e6ada..0bbe7fa7a959c5c04af74454affadbbb5e702b8c 100644 (file)
--- 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 fc0514897e3df697f8c660ff6840c00d30e979bf..7804c8b5edd06e8f8902c011843ee4aeea740344 100644 (file)
--- 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 (file)
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 4bd88630349a87b45dab9e0d1a7e4994bffe0a5a..130b2ae593296787460f6aee186986cd1d19b919 100755 (executable)
--- 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