* Makefile.am (libtoolize): Substitute $(nobase_pkgvdata_DATA).

pkgvmacro_DATA is no longer set in the makefile.
* libtoolize.m4sh (func_massage_pkgvmacro_DATA): Use it and, for
consistency, renamed from this...
(func_massage_nobase_pkgvdata_DATA): ...to this.  Adjust all
callers.

diff --git a/ChangeLog b/ChangeLog
index 2c99b0d70e7cc180985a8ce5aa82c6c7b29293cf..56d3a8717672ad54d6eed2ce154f3be906225304 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-01  Gary V. Vaughan  <gary@gnu.org>
+
+       * Makefile.am (libtoolize): Substitute $(nobase_pkgvdata_DATA).
+       pkgvmacro_DATA is no longer set in the makefile.
+       * libtoolize.m4sh (func_massage_pkgvmacro_DATA): Use it and, for
+       consistency, renamed from this...
+       (func_massage_nobase_pkgvdata_DATA): ...to this.  Adjust all
+       callers.
+
 2005-04-01  Gary V. Vaughan  <gary@gnu.org>
 
        Fix problems with serial comparison sed scripts, and factor out

diff --git a/Makefile.am b/Makefile.am
index 5fd927b11a768d8f90d09fc473d60dd795ab738f..fb5c707852f30d0bd74faaa4ed7e4b96e21f8733 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -163,7 +163,7 @@ libtoolize: $(top_srcdir)/libtoolize.in
        input="libtoolize.m4sh"; \
        ltdldatafiles=`cd libltdl; make show-ltdldatafiles`; \
        $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
-               -e 's,@pkgvmacro_DATA\@,$(pkgvmacro_DATA),g' \
+               -e 's,@nobase_pkgvdata_DATA\@,$(nobase_pkgvdata_DATA),g' \
                -e "s,@pkgvltdl_files\@,`echo $$ltdldatafiles`,g" \
                $(top_srcdir)/libtoolize.in > libtoolize.tmp
        chmod a+x libtoolize.tmp

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 6ae585526da87c320bae16b33a4d58e01808e9b3..242b028e99c5ea4fe1f24eb538d311c106833a61 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -793,17 +793,17 @@ func_check_macros ()
 }
 
 
-# func_massage_pkgvmacro_DATA [glob_exclude]
-# @pkgvmacro_DATA\@ is substituted as per its value in Makefile.am; this
-# function massages it into a suitable format for func_copy_some_files.
-func_massage_pkgvmacro_DATA ()
+# func_massage_nobase_pkgvdata_DATA [glob_exclude]
+# @nobase_pkgvdata_DATA\@ is substituted as per its value in Makefile.am;
+# this function massages it into a suitable format for func_copy_some_files.
+func_massage_nobase_pkgvdata_DATA ()
 {
     pkgvmacro_files=     # GLOBAL VAR
 
     my_glob_exclude="$1"
 
     # Massage a value for pkgvmacro_files from the value used in Makefile.am.
-    for my_filename in @pkgvmacro_DATA@; do
+    for my_filename in @nobase_pkgvdata_DATA@; do
       my_filename=`$ECHO "X$my_filename" | $Xsed -e "$basename"`
 
       # ignore excluded filenames
@@ -858,7 +858,7 @@ func_massage_pkgvltdl_files ()
   func_massage_pkgvltdl_files
 
   # libtool.m4 and ltdl.m4 are handled specially below
-  func_massage_pkgvmacro_DATA 'libtool.m4|ltdl.m4'
+  func_massage_nobase_pkgvdata_DATA 'libtool.m4|ltdl.m4'
 
   glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'