[ng] rename: am__relativize -> am.dist.relativize-path

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

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 39c819ede4a3d1a87505e4c656dbb1d0548d3d7c..d16cc1dbe01571ba7c1d947a6c605906bdb5d426 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -101,7 +101,7 @@ if %?SUBDIRS%
 ## - DIR2            relative pathname, relative to the current directory
 ## Output:
 ## - reldir          relative pathname of DIR2, relative to DIR1
-am__relativize = \
+am.dist.relativize-path = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
   sed_rest='s,^[^/]*/*,,'; \
@@ -217,10 +217,10 @@ if %?SUBDIRS%
              || $(MKDIR_P) "$(distdir)/$$subdir" \
              || exit 1; \
            dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-           $(am__relativize); \
+           $(am.dist.relativize-path); \
            new_distdir=$$reldir; \
            dir1=$$subdir; dir2="$(top_distdir)"; \
-           $(am__relativize); \
+           $(am.dist.relativize-path); \
            new_top_distdir=$$reldir; \
            echo " (cd $$subdir && $(MAKE) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
            echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

diff --git a/t/relativize.tap b/t/relativize.tap
index d940ddf2b722e58dc1e326bbd216b937e3e10c02..a9644af055fb8305ab509dc9c0d9806f85e370db 100755 (executable)
--- a/t/relativize.tap
+++ b/t/relativize.tap
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test Automake-provided internal make macro $(am__relativize).
+# Test Automake-provided internal make macro $(am.dist.relativize-path).
 
 am_create_testdir=empty
 . ./defs || exit 1
@@ -41,7 +41,7 @@ SUBDIRS = .
 
 .PHONY: test
 test:
-       @$(am__relativize); echo "result: '$$reldir'"; set -x; \
+       @$(am.dist.relativize-path); echo "result: '$$reldir'"; set -x; \
         case $${reldir:-.} in "$$exp"|"$$exp/.") ;; *) exit 1;; esac
 END
 
@@ -55,8 +55,8 @@ rel_ ()
                env dir1=$1 dir2=$2 exp=$4 $MAKE test
 }
 
-# am__relativize
-# ~~~~~~~~~~~~~~
+# am.dist.relativize-path
+# ~~~~~~~~~~~~~~~~~~~~~~~
 # Computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2.
 # Input:
 #   - DIR1     relative pathname, relative to the current directory