final changes to gets things to build on FC6

[build.git] / Rules.mk

diff --git a/Rules.mk b/Rules.mk
index 462d208..473a4e1 100644 (file)
--- a/Rules.mk
+++ b/Rules.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: Rules.mk,v 1.33 2007/03/19 16:25:04 thierry Exp $
+# $Id: Rules.mk,v 1.34 2007/07/19 20:39:33 mef Exp $
 #
 
 # Base rpmbuild in the current directory
@@ -120,7 +120,7 @@ SOURCES/%.tar: SOURCES/%
 all: $(RPMS) $(SRPM)
 
 # Build RPMS
-$(RPMS): $(SPECFILE) $(SOURCES)
+$(RPMS): $(SPECFILE) $(SOURCES) .rpmbuild.sh
        mkdir -p BUILD RPMS
        $(RPMBUILD) $(RPMFLAGS) -bb $<
 
@@ -131,15 +131,21 @@ $(wordlist 2,$(words $(RPMS)),$(RPMS)): $(firstword $(RPMS))
 endif
 
 # Build SRPM
-$(SRPM): $(SPECFILE) $(SOURCES)
+$(SRPM): $(SPECFILE) $(SOURCES) .rpmbuild.sh
        mkdir -p SRPMS
-       rpmbuild $(RPMFLAGS) -bs $<
+       $(RPMBUILD) $(RPMFLAGS) -bs $<
 
 # Base rpmbuild in the current directory
 .rpmmacros:
        echo "%_topdir $(HOME)" > $@
        echo "%_tmppath $(HOME)/tmp" >> $@
 
+.rpmbuild.sh:
+       echo "# GENERATED BY Rules.mk" > $@
+       echo "export HOME=$(HOME)" >> $@
+       echo "# There must be a more clever way to pass all args to rpmbuild!" >> $@
+       echo 'rpmbuild $$1 $$2 $$3 $$4 $$5 $$6' >> $@
+
 # Remove files generated by this package
 clean:
        rm -rf \