From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Wed, 27 Jan 1999 06:23:47 +0000 (+0000)
Subject: * Makefile.am (ltconfig, ltmain.sh): some broken makes don't like
X-Git-Tag: release-1-2f~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b2ff91e8ede20f4372c22b12434710c238ea387;p=thirdparty%2Flibtool.git

* Makefile.am (ltconfig, ltmain.sh): some broken makes don't like
macros in targets; replace $(srcdir) with @srcdir@
* configure.in (ACINCLUDE_M4_LIST): same problem; expand $srcdir
---

diff --git a/ChangeLog b/ChangeLog
index a29360a42..59d484976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-01-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* Makefile.am (ltconfig, ltmain.sh): some broken makes don't like
+	macros in targets; replace $(srcdir) with @srcdir@
+	* configure.in (ACINCLUDE_M4_LIST): same problem; expand $srcdir
+
 	* libltdl/Makefile.am (@TOINST@/libltdl.la): if installation is
 	enabled, create to-be-installed libltdl.la within @TOINST@
 	directory
diff --git a/Makefile.am b/Makefile.am
index 4f510bf83..1479f98e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,7 @@ update-timestamps:
 
 # Do line number substitution, as well as PACKAGE, VERSION and TIMESTAMP.
 # Line numbering transliterated from a section in autoconf (Autoconf 2.12).
-$(srcdir)/ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in $(TSDEPS)
+@srcdir@/ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in $(TSDEPS)
 	rm -f ltconfig.T
 	date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
 	$(AWK) '/@LINENO@/ { printf "%d:", NR } { print }' $(srcdir)/ltconfig.in | \
@@ -70,7 +70,7 @@ $(srcdir)/ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in $(TSDEPS)
 	mv -f ltconfig.T $@ || \
 	(rm -f $@ && cp ltconfig.T $@ && rm -f ltconfig.T)
 
-$(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(top_srcdir)/configure.in $(TSDEPS)
+@srcdir@/ltmain.sh: $(srcdir)/ltmain.in $(top_srcdir)/configure.in $(TSDEPS)
 	rm -f ltmain.shT
 	date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
 	sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
diff --git a/configure.in b/configure.in
index ad29d8c06..e88cd5948 100644
--- a/configure.in
+++ b/configure.in
@@ -44,10 +44,10 @@ dnl included in the distribution
 CONF_SUBDIRS="libltdl demo mdemo cdemo" # depdemo
 AC_SUBST(CONF_SUBDIRS)
 
-ACINCLUDE_M4_LIST="\$(srcdir)/acinclude.m4 "
+ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4 "
 DIST_MAKEFILE_LIST=
 for dir in $CONF_SUBDIRS; do
-  ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST\$(srcdir)/$dir/acinclude.m4 "
+  ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST${srcdir}/$dir/acinclude.m4 "
   DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile "
 done
 AC_SUBST(ACINCLUDE_M4_LIST)