[ng] rename: am.abs-dir -> am.dir.abs, am.abs-top-dir -> am.top-dir.abs

Suggested by Akim Demaille:
<http://lists.gnu.org/archive/html/automake-ng/2012-07/msg00228.html>

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/lib/am/am-dir.am b/lib/am/am-dir.am
index 5cc0ec9b15705a166db4fa28cad13f391946d1bb..9d82b100ada20b9038db0fd471f2280b0ac54d7c 100644 (file)
--- a/lib/am/am-dir.am
+++ b/lib/am/am-dir.am
@@ -25,14 +25,14 @@
 am.dir = .am
 
 # Its counterpart with an absolute path, for recipes that can chdir around.
-am.abs-dir = $(abs_builddir)/$(am.dir)
+am.dir.abs = $(abs_builddir)/$(am.dir)
 
 # Its counterpart for use in subdir makefiles, in case they need to refer
 # to the top-level $(am.dir) directory.
 am.top-dir = $(top_builddir)/$(am.dir)
 
 # Its counterpart with an absolute path and for use in subdir makefiles.
-am.abs-top-dir = $(abs_top_builddir)/$(am.dir)
+am.top-dir.abs = $(abs_top_builddir)/$(am.dir)
 
 .PHONY: am--distclean-amdir
 am--distclean-amdir:

diff --git a/t/am-dir.sh b/t/am-dir.sh
index 1ffc6663d238d755d81128be5c40fd3c175d328e..3a09047254c101420a20281c27d0a9df87c6220b 100755 (executable)
--- a/t/am-dir.sh
+++ b/t/am-dir.sh
@@ -19,9 +19,9 @@
 #
 #  * internal variables:
 #      $(am.dir)
-#      $(am.abs-dir)
+#      $(am.dir.abs)
 #      $(am.top-dir)
-#      $(am.abs-top-dir)
+#      $(am.top-dir.abs)
 #
 #  * cleaning rules and "make distcheck" interaction.
 #
@@ -47,9 +47,9 @@ subdir:
 all-local: | $(am.dir) subdir
        : > $(am.dir)/sub
        : > $(am.top-dir)/top
-       (cd ./subdir && : > $(am.abs-dir)/abs-sub)
+       (cd ./subdir && : > $(am.dir.abs)/abs-sub)
        rmdir subdir
-       (cd /tmp && : > $(am.abs-top-dir)/abs-top)
+       (cd /tmp && : > $(am.top-dir.abs)/abs-top)
 END
 
 sort > exp <<END