common Makefile.common,1.10,1.11
Jeremy Katz (katzj)
fedora-extras-commits at redhat.com
Thu May 5 18:54:47 UTC 2005
- Previous message (by thread): rpms/enigma/devel .cvsignore, 1.2, 1.3 enigma.spec, 1.6, 1.7 sources, 1.2, 1.3 enigma-0.81-gcc34.patch, 1.1, NONE enigma-0.81-gcc4.patch, 1.1, NONE
- Next message (by thread): common tobuild,1.141,1.142
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: katzj
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7597
Modified Files:
Makefile.common
Log Message:
add patch from ensc to make the 'patch' and 'rediff'
targets work when $(RPM_BUILD_DIR) is set to another dir
Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.common 13 Apr 2005 19:55:11 -0000 1.10
+++ Makefile.common 5 May 2005 18:54:45 -0000 1.11
@@ -328,7 +328,7 @@
PATCHFILE := $(NAME)-$(VERSION)-$(SUFFIX).patch
patch:
@if test -z "$(SUFFIX)"; then echo "Must specify SUFFIX=whatever" ; exit 1; fi
- (cd $(RPM_BUILD_DIR)/.. && gendiff $(NAME)-$(VERSION) .$(SUFFIX) | $(FILTERDIFF) > $(PATCHFILE)) || true
+ (cd $(RPM_BUILD_DIR)/.. && gendiff $(NAME)-$(VERSION) .$(SUFFIX) | $(FILTERDIFF)) > $(PATCHFILE) || true
@if ! test -s $(PATCHFILE); then echo "Patch is empty!"; exit 1; fi
@echo "Created $(PATCHFILE)"
@grep "$(PATCHFILE)" CVS/Entries >&/dev/null || cvs add -ko $(PATCHFILE) || true
@@ -341,7 +341,7 @@
@if ! test -f "$(PATCHFILE)"; then echo "$(PATCHFILE) not found"; exit 1; fi
@mv -f $(PATCHFILE) $(PATCHFILE)\~
@sed '/^--- /,$$d' < $(PATCHFILE)\~ > $(PATCHFILE)
- @cd $(RPM_BUILD_DIR)/.. && gendiff $(NAME)-$(VERSION) .$(SUFFIX) | $(FILTERDIFF) >> $(PATCHFILE) || true
+ @(cd $(RPM_BUILD_DIR)/.. && gendiff $(NAME)-$(VERSION) .$(SUFFIX) | $(FILTERDIFF)) >> $(PATCHFILE) || true
clog: $(SPECFILE)
@sed -n '/^%changelog/,/^$$/{/^%/d;/^$$/d;s/%%/%/g;p}' $(SPECFILE) | tee $@
- Previous message (by thread): rpms/enigma/devel .cvsignore, 1.2, 1.3 enigma.spec, 1.6, 1.7 sources, 1.2, 1.3 enigma-0.81-gcc34.patch, 1.1, NONE enigma-0.81-gcc4.patch, 1.1, NONE
- Next message (by thread): common tobuild,1.141,1.142
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list