Re: FYI: libtool--devo--1.0--patch-114

[Gary V. Vaughan]

Hi Noah,

Noah Misch wrote:
> On Thu, Aug 05, 2004 at 04:33:55PM +0100, Gary V. Vaughan wrote:
>>
>>      * bootstrap: Run the bootstrap rules from a file named Makefile,
>>      copied from Makefile.am for fresh checkouts.
>>
>>--- orig/bootstrap
>>+++ mod/bootstrap
>>@@ -54,8 +54,10 @@
>> # Building distributed files from configure is bad for automake, so we
>> # generate them here, and have Makefile rules to keep them up to date:
>> rm -f ./config/ltmain.sh ./m4/ltversion.m4
>>+test -f Makefile || { makefile=Makefile; cp Makefile.am $makefile; }
>> make -f Makefile.am ./config/ltmain.sh ./m4/ltversion.m4 \
>>     top_srcdir=. PACKAGE="$2" VERSION="$3"
>>+test -z "$makefile" || rm -f "$makefile"
> 
> Is this not a no-op since the intervening line still has ``-f Makefile.am''?


Thanks.  Yes, it is an error, but definitely not a no-op since the presence of
the Makefile allows this rule to run:

config/ltmain.sh: config/ltmain.in configure.ac stamp-vcl Makefile
        $(timestamp); \
        cd $(top_srcdir); \
        rm -f config/ltmain.tmp; \
        input="ltmain.in"; \
        $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
                -e "s,@package_revision\@,$$1,g" \
                config/ltmain.in > config/ltmain.tmp; \
        chmod a-w config/ltmain.tmp; \
        mv -f config/ltmain.tmp config/ltmain.sh

>>--- orig/m4/libtool.m4
>>+++ mod/m4/libtool.m4
>>@@ -1545,8 +1545,8 @@
>>          striplib="$STRIP -x"
>>          AC_MSG_RESULT([yes])
>>        else
>>-  AC_MSG_RESULT([no])
>>-fi
>>+         AC_MSG_RESULT([no])
>>+       fi
> 
> 
> (A trivial cleanup that does not need a ChangeLog mention, I take it?)

Yep.

Cheers,
        Gary.
-- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook

signature.asc
Description: OpenPGP digital signature