Re: [PATCH 1/2] Fix make dist relating to xmlconf conditional

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 01/06/2012 07:39 AM, Fabio M. Di Nitto wrote:
> On 1/6/2012 3:19 PM, Steven Dake wrote:
>> On 01/06/2012 03:12 AM, Jan Friesse wrote:
>>> Steve,
>>> I was trying this way too, but it has problem, that after build, make
>>> clean doesn't clean corosync-xmlproc.
>>>
>>> Honza
>>
>> Ok.
>>
>> Well I'd rather make dist work then make clean.  Wihout make dist we
>> can't do any tarball releases.  Perhaps we can file a bug for make clean
>> not totally working properly.
>>
>> Regards
>> -steve
>>
>>>
>>> Steven Dake napsal(a):
>>>> Signed-off-by: Steven Dake <sdake@xxxxxxxxxx>
>>>> ---
>>>>  tools/Makefile.am |    6 +++---
>>>>  1 files changed, 3 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/tools/Makefile.am b/tools/Makefile.am
>>>> index 3089150..614b24e 100644
>>>> --- a/tools/Makefile.am
>>>> +++ b/tools/Makefile.am
>>>> @@ -41,13 +41,13 @@ sbin_PROGRAMS        = corosync-fplay
>>>> corosync-cfgtool \
>>>>  bin_SCRIPTS        = corosync-blackbox
>>>>  
>>>>  if INSTALL_XMLCONF
>>>> -bin_PROGRAMS        = corosync-xmlproc
>>>> +bin_SCRIPTS        += corosync-xmlproc
> 

The makefile converts corosync-xmlproc into corosync-xmlproc.sh

> ^^^^^^ here
> 
>>>> +endif
>>>>  
>>>>  corosync-xmlproc: corosync-xmlproc.sh
>>>>      sed -e 's#@''DATADIR@#${datadir}#g' $< > $@
>>>> -endif
>>>>  
>>>> -EXTRA_DIST        = $(bin_SCRIPTS) corosync-notifyd.sysconfig.example
>>>> +EXTRA_DIST        = $(bin_SCRIPTS) corosync-xmlproc.sh
> 

notice the extension (.sh)

Without including it in the distribution, the tarball will not build.
These are two separate files.

I believe what is desired is that corosync-xmlproc should be deleted on
make clean.


> ^^^^ this is the issue.
> 
> you add corosync-xmlproc to bin_SCRIPTS and ship it in EXTRA_DIST.
> 
> that´s why it´s not cleaned properly.
> 
> bin_SCRIPTS should not be part of EXTRA_DIST
> 
> Fabio
> _______________________________________________
> discuss mailing list
> discuss@xxxxxxxxxxxx
> http://lists.corosync.org/mailman/listinfo/discuss

_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss



[Index of Archives]     [Linux Clusters]     [Corosync Project]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Linux Kernel]     [Linux SCSI]     [X.Org]

  Powered by Linux