On 01/06/2012 04:52 PM, Steven Dake wrote:
> 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.
The problem is that you are including both corosync-xmlproc and
corosync-xmlproc.sh in EXTRA_DIST
Only .sh should be part of EXTRA_DIST. The other is generated by the
Makefile
>
> I believe what is desired is that corosync-xmlproc should be deleted on
> make clean.
>
You still need to drop it from EXTRA_DIST or it will be regenerated
every time you run "make dist"
Fabio
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
