Apply simpler solution for bug#73672

* libltdl/ltdl.mk: Replace conditional with LT_DOLLAR_SIGN for
  LT_ARGZ_H_PATH variable.
* m4/ltargz.m4: Add AC_SUBST for LT_ARGZ_H_PATH to set source path
  to LT_ARGZ_H file.
* NEWS: Remove additional spacing.

diff --git a/NEWS b/NEWS
index d1e1a1a3500eaa4a03f24a67a4828e60c23697be..c83ad75bbd601d44df80c15dd8ed3639476ea114 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 
   - Fix incorrect use of workarounds designed for Darwin versions that
     don't have -single_module support.
-  
+
   - Fix errors when executing 'make distclean' and 'make maintainer-clean'.
 
   - Fix bug where the constructed rpath omit directories, instead of

diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk
index b1ee800f6bdfde031ede08068da25856d7d75241..2e224cbc53fddf1a2409f9da62961776c25b8a18 100644 (file)
--- a/libltdl/ltdl.mk
+++ b/libltdl/ltdl.mk
@@ -131,8 +131,7 @@ EXTRA_DIST         += libltdl/COPYING.LIB \
 ## Gnulib Makefile.am snippets ##
 ## --------------------------- ##
 
-# Ugly conditional for 'make maintainer-clean' when LT_ARGZ_H is empty
-BUILT_SOURCES  += @LT_DOLLAR_SIGN@(if @LT_DOLLAR_SIGN@(LT_ARGZ_H),libltdl/libltdl/@LT_DOLLAR_SIGN@(LT_ARGZ_H))
+BUILT_SOURCES  += $(LT_ARGZ_H_PATH)
 EXTRA_DIST     += libltdl/libltdl/lt__argz_.h \
                   libltdl/lt__argz.c
 

diff --git a/m4/ltargz.m4 b/m4/ltargz.m4
index 6c24f1766260593cfae80cb4e0144fb54f51b794..327b0b47c57852ae692a00c93fc88ca5fec7c951 100644 (file)
--- a/m4/ltargz.m4
+++ b/m4/ltargz.m4
@@ -71,10 +71,9 @@ AS_IF([test -z "$LT_ARGZ_H"],
         [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
                    [This value is set to 1 to indicate that the system argz facility works])],
         [LT_ARGZ_H=lt__argz.h
+        LT_ARGZ_H_PATH=libltdl/libltdl/$LT_ARGZ_H
         AC_LIBOBJ([lt__argz])])])
 
 AC_SUBST([LT_ARGZ_H])
-
-# Avoid non-POSIX variable name
-AC_SUBST([LT_DOLLAR_SIGN],[$])dnl
+AC_SUBST([LT_ARGZ_H_PATH])
 ])