release-notes/devel Makefile,1.15,1.16

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14646

Modified Files:
	Makefile 
Log Message:
Apparently Rawhide's make is not happy with line continuation markers
in some situations, so I'm getting rid of them for now in the problem
targets.  We'll research after FC6 test2 if possible.



Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/devel/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile	18 Jul 2006 20:12:49 -0000	1.15
+++ Makefile	18 Jul 2006 20:37:00 -0000	1.16
@@ -15,6 +15,8 @@
 LEGALNOTICEBASE	=legalnotice-relnotes
 # Special basename for packaging:
 PKGNAME		=fedora-release-notes
+# Special PKGRPMFLAGS to keep Rawhide happy for f13
+PKGRPMFLAGS	=--define "_topdir ${PWD}" --define "_specdir ${PWD}" --define "_sourcedir ${PWD}" --define "_srcrpmdir ${PWD}" --define "_rpmdir ${PWD}"
 ########################################################################
 # List each XML file of your document in the template below.  Append the 
 # path to each file to the "XMLFILES-${1}" string.  Use a backslash if you
@@ -153,8 +155,7 @@
 .PHONY: release-pkg
 release-pkg:: clean ${PKGNAME}-${VERSION}.tar.gz
 ${PKGNAME}-${VERSION}.tar.gz::  $(foreach LANG,${LANGUAGES},release-pkg-${LANG})
-	cp -a --parents css/*css fedora.css img/*png stylesheet-images/*png \
-		${PKGNAME}-${VERSION}
+	cp -a --parents css/*css fedora.css img/*png stylesheet-images/*png ${PKGNAME}-${VERSION}
 	cp -a about-* ${PKGNAME}-${VERSION}
 	tar czf ${PKGNAME}-${VERSION}.tar.gz ${PKGNAME}-${VERSION}
 
@@ -170,12 +171,7 @@
 .PHONY: release-srpm
 release-srpm:: ${PKGNAME}-${VERSION}-${RPMRELEASE}.src.rpm
 ${PKGNAME}-${VERSION}-${RPMRELEASE}.src.rpm::  ${PKGNAME}-${VERSION}.tar.gz
-	rpmbuild -bs --define "_topdir ${PWD}"				\
-		--define "_specdir ${PWD}"				\
-		--define "_sourcedir ${PWD}"				\
-		--define "_srcrpmdir ${PWD}"				\
-		--define "_rpmdir ${PWD}"				\
-		${PKGNAME}.spec
+	rpmbuild -bs ${PKGRPMFLAGS} ${PKGNAME}.spec
 
 clean::
 	${RM} -rf ${PKGNAME}-${VERSION}-${RPMRELEASE}.src.rpm