Re: [PATCH] libtoolize: fix ltdl installation order

2015-01-16 Thread Gary V. Vaughan
On Jan 16, 2015, at 10:34 AM, Pavel Raiskup  wrote:
> 
> * Makefile.am (pkgltdl_files): Move the Makefile.in file down in
> the list after aclocal.m4.
> ---
> Makefile.am | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index f1b7ead..794d58d 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -441,13 +441,14 @@ pkgmacro_files  = libtool.m4 ltargz.m4 ltdl.m4 
> ltoptions.m4 ltsugar.m4 \
> ltversion.m4 lt~obsolete.m4
> 
> ## These are installed as a subdirectory of pkgdatadir so that
> -## libtoolize --ltdl can find them later:
> +## libtoolize --ltdl can find them later.  Note that this list requires
> +## specific order to avoid unnecessary re-autotooling after libtoolize run.
> pkgltdl_files = COPYING.LIB \
> Makefile.am \
> -   Makefile.in \
> README \
> configure.ac \
> aclocal.m4 \
> +   Makefile.in \
> config-h.in \
> configure \
> libltdl/lt__alloc.h \

Agreed, thank you.  Applied and pushed!

Cheers,
-- 
Gary V. Vaughan (gary AT gnu DOT org)




[PATCH] libtoolize: fix ltdl installation order

2015-01-16 Thread Pavel Raiskup
Makefile.in has aclocal.m4 as prerequisite, so Makefile.in should
be installed later to avoid unnecessary rebuild by (versioned)
aclocal.

The problem is worse if the current libtool package has been built
against different automake version than the current libtoolize is
run against (high chance that the proper version of aclocal is not
found and the overall build fails).

Fixes regression caused by commit 99a808be.

* Makefile.am (pkgltdl_files): Move the Makefile.in file down in
the list after aclocal.m4.
---
 Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f1b7ead..794d58d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -441,13 +441,14 @@ pkgmacro_files= libtool.m4 ltargz.m4 ltdl.m4 
ltoptions.m4 ltsugar.m4 \
  ltversion.m4 lt~obsolete.m4
 
 ## These are installed as a subdirectory of pkgdatadir so that
-## libtoolize --ltdl can find them later:
+## libtoolize --ltdl can find them later.  Note that this list requires
+## specific order to avoid unnecessary re-autotooling after libtoolize run.
 pkgltdl_files  = COPYING.LIB \
  Makefile.am \
- Makefile.in \
  README \
  configure.ac \
  aclocal.m4 \
+ Makefile.in \
  config-h.in \
  configure \
  libltdl/lt__alloc.h \
-- 
2.1.0