DIST_DEFINES duplicated in Makefile.common?

[Todd Zullinger]

Greetings,

It seems that DIST_DEFINES is duplicated in Makefile.common, being
included in RPM_DEFINES and then also being used in places where
RPM_DEFINES is used (directly, and as a part of RPM_WITH_DIRS).

Does the attached patch look reasonably sane?

Disclaimer: I've had a few rum-based beverages this evening and I
might be missing some important reason for the duplication.

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Religion. A daughter of Hope and Fear, explaining to Ignorance the
nature of the Unknowable.
    -- Ambrose Bierce, The Enlarged Devil's Dictionary, 1906

-------------- next part --------------
Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile.common
--- Makefile.common	3 Jul 2008 19:15:27 -0000	1.105
+++ Makefile.common	10 Jul 2008 01:47:05 -0000
@@ -94,11 +94,11 @@ ifndef NAME
 $(error "You can not run this Makefile without having NAME defined")
 endif
 ifndef VERSION
-VERSION := $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1)
+VERSION := $(shell rpm $(RPM_DEFINES) -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1)
 endif
 # the release of the package
 ifndef RELEASE
-RELEASE := $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1)
+RELEASE := $(shell rpm $(RPM_DEFINES) -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1)
 endif
 # this is used in make patch, maybe make clean eventually.
 # would be nicer to autodetermine from the spec file...
@@ -382,7 +382,7 @@ check: test-srpm
 
 ## use this to build an srpm locally
 srpm: sources $(TARGETS)
-	$(RPM_WITH_DIRS) $(DIST_DEFINES) --nodeps -bs $(SPECFILE)
+	$(RPM_WITH_DIRS) --nodeps -bs $(SPECFILE)
 
 test-srpm: srpm
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 542 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/fedora-buildsys-list/attachments/20080709/e2a2c7a6/attachment.sig>