diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2014-12-04 14:38:01 +0000 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2014-12-04 14:43:05 +0000 |
| commit | 57a78dd5310fda320c51657f09e13a985961ef85 (patch) | |
| tree | 4fbdf3f3d6f7944e2c10f068e7479657da309843 | |
| parent | 218bf6f4c2ed02ee13293b2100238008ef225405 (diff) | |
| download | libtool-57a78dd5310fda320c51657f09e13a985961ef85.tar.gz | |
libltdl: edit AM_CPPFLAGS correctly for libltdl/Makefile.am.
* libltdl/ltdl.mk (AM_CPPFLAGS): Make sure the sed expression to
remove the first libltdl/ on each line is not confused by misuse
of linebreaks.
* Makefile.am (lt_Makefile_am): Also edit out the duplicated
include paths after libltdl/ elimination.
* NEWS: Update.
Reported by Michael Wobst
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | libltdl/ltdl.mk | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 1fb5e5d3..f1b7ead2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -191,6 +191,7 @@ $(lt_Makefile_am): $(ltdl_mk) '$(SED)' -n '/^.. DO NOT REMOVE THIS LINE -- /,$$p' \ '$(ltdl_mk)' \ |'$(SED)' -e 's|libltdl_||; s|libltdl/||; s|: libltdl/|: |' \ + -e '/^[ ]*-I\$$(srcdir)\/libltdl -Ilibltdl \\/d' \ -e 's|\$$(libltdl_|$$(|' \ ) |'$(SED)' -e '/^.. DO NOT REMOVE THIS LINE -- /d' \ -e '1s,^\(.. Makefile.\)inc.*,\1am -- Process this file with automake to produce Makefile.in,' > '$@' @@ -15,6 +15,9 @@ NEWS - list of user-visible changes between releases of GNU Libtool - freebsd-elf library versioning was upgraded incorrectly in 2.4.4, but now works properly again. + - Fix a 2.4.4 regression so that libltdl subprojects do not warn + about missing libltdl/libltdl directory as in prior releases. + * Noteworthy changes in release 2.4.4 (2014-11-29) [stable] diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk index 4d32de93..6ce3c400 100644 --- a/libltdl/ltdl.mk +++ b/libltdl/ltdl.mk @@ -34,9 +34,9 @@ # -I$(srcdir) is needed for user that built libltdl with a sub-Automake # (not as a sub-package!) using 'nostdinc': AM_CPPFLAGS += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \ - -DLTDL -I. -I$(srcdir) \ - -Ilibltdl -I$(srcdir)/libltdl \ - -Ilibltdl/libltdl -I$(srcdir)/libltdl/libltdl + -DLTDL -I. -I$(srcdir) -Ilibltdl \ + -I$(srcdir)/libltdl -Ilibltdl/libltdl \ + -I$(srcdir)/libltdl/libltdl AM_LDFLAGS += -no-undefined LTDL_VERSION_INFO = -version-info 10:1:3 |