From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 26 Oct 2004 21:48:28 +0000 (+0000)
Subject: - remove rpmbuild override
X-Git-Tag: planetlab-3_0-branch-point~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8e88ef8c71c1ee215880961038b213acf38bad89;p=build.git

- remove rpmbuild override
---

diff --git a/Makerules b/Makerules
index e653726c..1bed3cf4 100644
--- a/Makerules
+++ b/Makerules
@@ -32,7 +32,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $Id: Makerules,v 1.10 2004/08/12 21:21:31 mlh-pl_rpm Exp $
+# $Id: Makerules,v 1.11 2004/09/18 19:50:02 mlh-pl_rpm Exp $
 #
 
 # Base cvsps and rpmbuild in the current directory
@@ -175,12 +175,12 @@ all: RPMS/$(ARCH)/$(NVR).$(ARCH).rpm SRPMS/$(NVR).src.rpm
 # Build RPM
 RPMS/$(ARCH)/$(NVR).$(ARCH).rpm: SPECS/$(notdir $(SPEC)) $(SOURCES) .rpmmacros
 	mkdir -p BUILD RPMS
-	$(RPMBUILD) $(RPMFLAGS) -bb $<
+	rpmbuild $(RPMFLAGS) -bb $<
 
 # Build SRPM
 SRPMS/$(NVR).src.rpm: SPECS/$(notdir $(SPEC)) $(SOURCES) .rpmmacros
 	mkdir -p SRPMS
-	$(RPMBUILD) $(RPMFLAGS) -bs $<
+	rpmbuild $(RPMFLAGS) -bs $<
 
 # Base rpmbuild in the current directory
 .rpmmacros:
diff --git a/Rules.mk b/Rules.mk
index e653726c..1bed3cf4 100644
--- a/Rules.mk
+++ b/Rules.mk
@@ -32,7 +32,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $Id: Makerules,v 1.10 2004/08/12 21:21:31 mlh-pl_rpm Exp $
+# $Id: Makerules,v 1.11 2004/09/18 19:50:02 mlh-pl_rpm Exp $
 #
 
 # Base cvsps and rpmbuild in the current directory
@@ -175,12 +175,12 @@ all: RPMS/$(ARCH)/$(NVR).$(ARCH).rpm SRPMS/$(NVR).src.rpm
 # Build RPM
 RPMS/$(ARCH)/$(NVR).$(ARCH).rpm: SPECS/$(notdir $(SPEC)) $(SOURCES) .rpmmacros
 	mkdir -p BUILD RPMS
-	$(RPMBUILD) $(RPMFLAGS) -bb $<
+	rpmbuild $(RPMFLAGS) -bb $<
 
 # Build SRPM
 SRPMS/$(NVR).src.rpm: SPECS/$(notdir $(SPEC)) $(SOURCES) .rpmmacros
 	mkdir -p SRPMS
-	$(RPMBUILD) $(RPMFLAGS) -bs $<
+	rpmbuild $(RPMFLAGS) -bs $<
 
 # Base rpmbuild in the current directory
 .rpmmacros: