[PATCH rhel7-branch] Also, don't require the scratch targets to call po-pull.

David Shea dshea at redhat.com
Fri Mar 27 17:39:11 UTC 2015


On 03/27/2015 01:36 PM, Brian C. Lane wrote:
> On Fri, Mar 27, 2015 at 01:06:24PM -0400, Chris Lumens wrote:
>> You will need to run "make po-empty" or something first, though.
>>
>> Related: rhbz#1205285
>> ---
>>   Makefile.am | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index 81e3706..23982e5 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -74,11 +74,11 @@ po-empty:
>>   			exit 1 ; \
>>   	done
>>   
>> -scratch: po-pull
>> +scratch:
>>   	$(MAKE) ARCHIVE_TAG=HEAD dist
>>   	git checkout -- po/$(PACKAGE_NAME).pot
>>   
>> -scratch-bumpver: po-pull
>> +scratch-bumpver:
>>   	@opts="-S -n $(PACKAGE_NAME) -v $(PACKAGE_VERSION) -r $(PACKAGE_RELEASE) -b $(PACKAGE_BUGREPORT)" ; \
>>   	if [ ! -z "$(IGNORE)" ]; then \
>>   		opts="$${opts} -i $(IGNORE)" ; \
>> -- 
>> 2.2.2
> On master we have these depend on po-empty. Any reason not to do that
> here?
>

I'll second po-empty. It only creates the empty .po file if there isn't 
a file already, so it's not going to overwrite anything.


More information about the anaconda-patches mailing list