[Libreoffice-commits] core.git: 2 commits - setup_native/CustomTarget_scripts.mk

[d.ostrovsky at idaia.de]

Hi Thorsten,

ah well, it was trying blind to fix it (hadn't access to a system with  
rpm package machinery),
but somehow i wasn't sure in the end... ;-)

David

Zitat von Thorsten Behrens <thb at documentfoundation.org>:

> Hi David,
>
> both the below fixes are needed for a build to pass here - what was
> the reason for the revert?
>
> David Ostrovsky wrote:
>>  setup_native/CustomTarget_scripts.mk |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> New commits:
>> commit 5f2cfb8dc537bd99399ba3942d0f685b6db6841b
>> Author: David Ostrovsky <david at ostrovsky.org>
>> Date:   Sun Feb 10 13:45:06 2013 +0100
>>
>>     Revert "replace '$<' with '$%' as it was meant here"
>>
>>     This reverts commit ef300e2dc3ac163cff14d659cc6e2154221c1a4e.
>>
>> diff --git a/setup_native/CustomTarget_scripts.mk  
>> b/setup_native/CustomTarget_scripts.mk
>> index 10c7c0ba..f9edd90 100644
>> --- a/setup_native/CustomTarget_scripts.mk
>> +++ b/setup_native/CustomTarget_scripts.mk
>> @@ -26,7 +26,7 @@ $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm:  
>> $(SRCDIR)/setup_native/scripts/fake
>>  	chmod g+w $(scripts_WORKDIR)/fake-db-root
>>
>>  $(scripts_WORKDIR)/install:  
>> $(SRCDIR)/setup_native/scripts/install_linux.sh  
>> $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm
>> -	$(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $? $@
>> +	$(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
>>  	chmod 775 $@
>>
>>  $(scripts_WORKDIR)/uninstall:  
>> $(SRCDIR)/setup_native/scripts/uninstall_linux.sh
>> commit a92ae7280ebb4021c576f8604ead785ee0ba219e
>> Author: David Ostrovsky <david at ostrovsky.org>
>> Date:   Sun Feb 10 13:44:56 2013 +0100
>>
>>     Revert "fix fake-db-1.0-0.noarch.rpm: swap target with prerequisite"
>>
>>     This reverts commit ef45fe7ff055692ec43bb5d6a438fb6ec29a9004.
>>
>> diff --git a/setup_native/CustomTarget_scripts.mk  
>> b/setup_native/CustomTarget_scripts.mk
>> index 71ca7b5..10c7c0ba 100644
>> --- a/setup_native/CustomTarget_scripts.mk
>> +++ b/setup_native/CustomTarget_scripts.mk
>> @@ -22,7 +22,7 @@ $(eval $(call  
>> gb_CustomTarget_register_targets,setup_native/scripts,\
>>  $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm:  
>> $(SRCDIR)/setup_native/scripts/fake-db.spec
>>  	mkdir -p $(scripts_WORKDIR)/fake-db-root
>>  	$(RPM) --define "_builddir $(scripts_WORKDIR)/fake-db-root" \
>> -		--define "_rpmdir $(scripts_WORKDIR)" -bb $<
>> +		--define "_rpmdir $(scripts_WORKDIR)" -bb $@
>>  	chmod g+w $(scripts_WORKDIR)/fake-db-root
>>
>>  $(scripts_WORKDIR)/install:  
>> $(SRCDIR)/setup_native/scripts/install_linux.sh  
>> $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm
>> _______________________________________________
>
> Cheers,
>
> -- Thorsten
>