common Makefile.common,1.35,1.36

[Jeremy Katz (katzj)]

Author: katzj

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

Modified Files:
	Makefile.common 
Log Message:
commit scop's patch for specfile queries (#194827)



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile.common	16 Dec 2005 16:57:12 -0000	1.35
+++ Makefile.common	12 Jun 2006 15:59:26 -0000	1.36
@@ -27,6 +27,33 @@
 DISTVAL = $(word 4, $(BRANCHINFO))
 DIST_DEFINES = --define "dist $(DIST)" --define "$(DISTVAR) $(DISTVAL)"
 
+## a base directory where we'll put as much temporary working stuff as we can
+ifndef WORKDIR
+WORKDIR := $(shell pwd)
+endif
+## of course all this can also be overridden in your RPM macros file,
+## but this way you can separate your normal RPM setup from your CVS
+## setup. Override RPM_WITH_DIRS in ~/.cvsextrasrc to avoid the usage of
+## these variables.
+SRCRPMDIR ?= $(WORKDIR)
+BUILDDIR ?= $(WORKDIR)
+RPMDIR ?= $(WORKDIR)
+MOCKDIR ?= $(WORKDIR)
+## SOURCEDIR is special; it has to match the CVS checkout directory, 
+## because the CVS checkout directory contains the patch files. So it basically 
+## can't be overridden without breaking things. But we leave it a variable
+## for consistency, and in hopes of convincing it to work sometime.
+ifndef SOURCEDIR
+SOURCEDIR := $(shell pwd)
+endif
+
+ifndef RPM_DEFINES
+RPM_DEFINES = --define "_sourcedir $(SOURCEDIR)" \
+		--define "_builddir $(BUILDDIR)" \
+		--define "_srcrpmdir $(SRCRPMDIR)" \
+		--define "_rpmdir $(RPMDIR)"
+endif
+
 # Initialize the variables that we need, but are not defined
 # the version of the package
 ifndef NAME
@@ -52,26 +79,6 @@
 include $(CVS_EXTRAS_RC)
 endif
 
-## a base directory where we'll put as much temporary working stuff as we can
-ifndef WORKDIR
-WORKDIR := $(shell pwd)
-endif
-## of course all this can also be overridden in your RPM macros file,
-## but this way you can separate your normal RPM setup from your CVS
-## setup. Override RPM_WITH_DIRS in .pkgcvsrc to avoid the usage of
-## these variables.
-SRCRPMDIR ?= $(WORKDIR)
-BUILDDIR ?= $(WORKDIR)
-RPMDIR ?= $(WORKDIR)
-MOCKDIR ?= $(WORKDIR)
-## SOURCEDIR is special; it has to match the CVS checkout directory, 
-## because the CVS checkout directory contains the patch files. So it basically 
-## can't be overridden without breaking things. But we leave it a variable
-## for consistency, and in hopes of convincing it to work sometime.
-ifndef SOURCEDIR
-SOURCEDIR := $(shell pwd)
-endif
-
 # The repository and the clients we use for the files
 REPOSITORY ?= http://cvs.fedora.redhat.com/repo/extras
 UPLOAD_REPOSITORY ?= https://cvs.fedora.redhat.com/repo/extras/upload.cgi
@@ -90,10 +97,7 @@
 RPM := $(shell if test -f /usr/bin/rpmbuild ; then echo rpmbuild ; else echo rpm ; fi)
 endif
 ifndef RPM_WITH_DIRS
-RPM_WITH_DIRS = $(RPM) --define "_sourcedir $(SOURCEDIR)" \
-		--define "_builddir $(BUILDDIR)" \
-		--define "_srcrpmdir $(SRCRPMDIR)" \
-		--define "_rpmdir $(RPMDIR)"
+RPM_WITH_DIRS = $(RPM) $(RPM_DEFINES)
 endif
 
 # CVS-safe version/release -- a package name like 4Suite screws things