The ltdl.h header is the published interface to libltdl, and

is thus not installed to $prefix/include/libltdl.  It has always
been used with `#include <ltdl.h>', so move just that one file
back to where it was before:

* libltdl/libltdl/ltdl.h: Moved from here...
* libltdl/ltdl.h: ...to here.
* libltdl/Makefile.am: Adjust.

diff --git a/ChangeLog b/ChangeLog
index b0ff5f2638dceaa1342568aba669ab32a7c74143..beebceaaf1b448b786bbe23cbc9c96a91423e138 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
+2004-11-23  Gary V. Vaughan  <gary@gnu.org>
+
+       The ltdl.h header is the published interface to libltdl, and
+       is thus not installed to $prefix/include/libltdl.  It has always
+       been used with `#include <ltdl.h>', so move just that one file
+       back to where it was before:
+
+       * libltdl/libltdl/ltdl.h: Moved from here...
+       * libltdl/ltdl.h: ...to here.
+       * libltdl/Makefile.am: Adjust.
+
 2004-11-23  Peter O'Gorman  <peter@pogma.com>
 
-       Do not require that libtoolize --ltdl=/some/path end in libltdl. Move
-       most libltdl headers to libtldl/libltdl to allow 
-       #include <libltdl/ltdl.h> to always work.
+       Do not require that libtoolize --ltdl=/some/path end in libltdl.
+       Move most libltdl headers to libtldl/libltdl to allow 
+       `#include <libltdl/ltdl.h>' to always work:
 
        * libltdl/Makefile.am, libltdl/loaders/Makefile.am: Look for includes
        in the new location.
@@ -16,7 +27,7 @@
        libltdl/lt_system.h, libltdl/ltdl.h, libltdl/slist.h: Removed, moved
        to libltdl/libltdl.
 
-2004-11-23  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+2004-11-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/libtool.texi (LT_INIT): s/libtool 1.6/libtool 2.0/.
        (Invoking libtoolize): Fix typo.
@@ -35,7 +46,7 @@
        Revert libtool--release--2.0--patch-68, my 2004-11-14 patch for
        parallel installation.
 
-2004-11-22  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+2004-11-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * m4/libtool.m4 (_LT_TAG_COMPILER): Document that with_gcc is
        tag-dependent.

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 160d7f57361178628d6199facd8b9b2ff83ee756..20d6b5b2a3024fda4f8617c73d20283f7b4af9e3 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -45,7 +45,7 @@ libdlloader_la_LIBADD = $(LTLIBOBJS)
 
 ## Libltdl brings it all together:
 if INSTALL_LTDL
-include_HEADERS                = libltdl/ltdl.h
+include_HEADERS                = ltdl.h
 pkginclude_HEADERS     = libltdl/lt_system.h libltdl/lt_error.h \
                          libltdl/lt_dlloader.h
 lib_LTLIBRARIES                += libltdl.la
@@ -55,7 +55,7 @@ if CONVENIENCE_LTDL
 noinst_LTLIBRARIES     = libltdlc.la
 endif
 
-libltdl_la_SOURCES     = libltdl/ltdl.h ltdl.c \
+libltdl_la_SOURCES     = ltdl.h ltdl.c \
                          libltdl/lt_dlloader.h lt_dlloader.c loaders/preopen.c
 libltdl_la_CPPFLAGS    = -DLTDLOPEN=libltdl $(AM_CPPFLAGS)
 libltdl_la_LDFLAGS     =  $(VERSION_INFO) $(LT_DLPREOPEN)

diff --git a/libltdl/libltdl/ltdl.h b/libltdl/ltdl.h
similarity index 100%
rename from libltdl/libltdl/ltdl.h
rename to libltdl/ltdl.h