common Makefile.common,1.97,1.98

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28724

Modified Files:
	Makefile.common 
Log Message:
Fix for RHEL-4 and earlier, also, revert accidental commit.

https://fedorahosted.org/fedora-infrastructure/attachment/ticket/531/



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- Makefile.common	24 Apr 2008 20:04:31 -0000	1.97
+++ Makefile.common	28 Apr 2008 14:53:17 -0000	1.98
@@ -19,7 +19,7 @@
 ifndef HEAD_BRANCH
 HEAD_BRANCH := devel
 endif
-BRANCH:=$(lastword $(shell pwd| cut -d/ --output-delimiter=" " -f2-))
+BRANCH:=$(shell pwd | awk -F '/' '{ print $$NF }' )
 # check to see if this is an early branched package; we should make this more
 # generic in the future
 ifeq ($(BRANCH),devel)
@@ -223,7 +223,7 @@
 upload-file  = $(UPLOAD_CLIENT) -F "name=$(NAME)" -F "md5sum=$${m%%[[:space:]]*}" -F "file=@$$f" $(UPLOAD_REPOSITORY)
 
 define upload-request
-echo "Checking : $$b on $(UPLOAD_REPOSITORY)..." ; set -x ;\
+echo "Checking : $$b on $(UPLOAD_REPOSITORY)..." ; \
 check=$$($(upload-check)) ; retc=$$? ; \
 if test $$retc -ne 0 ; then \
     echo "ERROR: could not check remote file status" ; \
@@ -256,9 +256,9 @@
 # Upload the FILES, adding to the ./sources manifest
 upload: $(FILES)
 	$(check-cert)
-	if ! test -f ./sources ; then touch ./sources ; fi
-	if ! test -f ./.cvsignore ; then touch ./.cvsignore ; fi
-	for f in $(FILES); do \
+	@if ! test -f ./sources ; then touch ./sources ; fi
+	@if ! test -f ./.cvsignore ; then touch ./.cvsignore ; fi
+	@for f in $(FILES); do \
 	    if ! test -s $$f ; then echo "SKIPPING EMPTY FILE: $$f" ; continue ; fi ; \
 	    b="$$(basename $$f)" ; \
 	    m="$$(cd $$(dirname $$f) && md5sum $$b)" ; \
@@ -279,9 +279,9 @@
 	        echo $$b >> .cvsignore ; \
 	    fi \
 	done
-	if grep "^/sources/" CVS/Entries >/dev/null; then true ; else cvs -Q add sources; fi
-	echo "Source upload succeeded. Don't forget to commit the new ./sources file"
-	cvs update sources .cvsignore
+	@if grep "^/sources/" CVS/Entries >/dev/null; then true ; else cvs -Q add sources; fi
+	@echo "Source upload succeeded. Don't forget to commit the new ./sources file"
+	@cvs update sources .cvsignore
 
 # Upload FILES and recreate the ./sources file to include only these FILES
 new-source new-sources: $(FILES)