Re: CentOS 7 and %reldir% not replaced?

[Simon Josefsson]

Bruno Haible <bruno@clisp.org> writes:

> Hi Simon,
>
>> > Can 'bootstrap' be used without gnulib-tool? I would guess yes.
>> 
>> Good point.  How about this instead?
>
> This is good. Please push it.

Done.

We have a lot of bug workaround code for automake < 1.14 behaviour that
could be dropped.  But let's wait a while for objections, before
considering to clean up things.

/Simon

> Thanks!
>
> Bruno
>
>> diff --git a/gnulib-tool b/gnulib-tool
>> index 99854415ba..9ee7560209 100755
>> --- a/gnulib-tool
>> +++ b/gnulib-tool
>> @@ -3861,7 +3861,7 @@ func_emit_lib_Makefile_am ()
>>      if test -n "$uses_subdirs"; then
>>        subdir_options=' subdir-objects'
>>      fi
>> -    echo "AUTOMAKE_OPTIONS = 1.11 gnits${subdir_options}"
>> +    echo "AUTOMAKE_OPTIONS = 1.14 gnits${subdir_options}"
>>    fi
>>    echo
>>    if test -z "$makefile_name"; then
>> @@ -4261,7 +4261,7 @@ func_emit_tests_Makefile_am ()
>>    if test -n "$uses_subdirs"; then
>>      subdir_options=' subdir-objects'
>>    fi
>> -  echo "AUTOMAKE_OPTIONS = 1.11 foreign${subdir_options}"
>> +  echo "AUTOMAKE_OPTIONS = 1.14 foreign${subdir_options}"
>>    echo
>>    if $for_test && ! $single_configure; then
>>      echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"
>> 
>
>
>
>

signature.asc
Description: PGP signature