From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Fri, 2 Mar 2007 20:42:25 +0000 (+0000)
Subject: revert to 1.23.2.1
X-Git-Tag: 4.2-rc2~642
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3213edb72c00d1d0a3e7b6f42207507a640c4d78;p=build.git

revert to 1.23.2.1
---

diff --git a/Rules.mk b/Rules.mk
index 9b2859d6..4e24727f 100644
--- 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.28 2007/02/09 01:16:19 thierry Exp $
+# $Id: Rules.mk,v 1.23.2.1 2006/07/24 19:33:13 mlhuang Exp $
 #
 
 # Base rpmbuild in the current directory
@@ -27,10 +27,7 @@ else
         # Define cvstag for tagged builds
 	echo "%define cvstag $(TAG)" >> $@
 endif
-	$(if $($(package)-SVNPATH),\
-  svn cat $($(package)-SVNPATH)/$(SPEC) >> $@,\
-  cvs -d $(CVSROOT) checkout -r $(TAG) -p $(SPEC) >> $@)
-
+	cvs -d $(CVSROOT) checkout -r $(TAG) -p $(SPEC) >> $@
 
 #
 # Parse spec file into Makefile fragment
@@ -44,7 +41,7 @@ parseSpec: LDFLAGS := -lrpm -lrpmbuild
 
 $(MK): $(SPECFILE) parseSpec .rpmmacros
 	mkdir -p tmp
-	./parseSpec $(RPMFLAGS) $(SPECFILE) > $@
+	./parseSpec $(SPECFILE) > $@
 
 # Defines SOURCES, SRPM, RPMS
 include $(MK)
@@ -63,29 +60,9 @@ $(patsubst %.tar,%,$(1))))))
 
 SOURCEDIRS := $(call stripext,$(SOURCES))
 
-# Thierry - Jan 29 2007
-# Allow different modules to have  different CVSROOT
-# and/or to be extracted from their SVNPATH
-#
-# is there a single module ? to mimick cvs export -d behaviour
-MULTI_MODULE := $(word 2,$(MODULE))
-ifeq "$(MULTI_MODULE)" ""
-# single module: do as before
 SOURCES/$(package):
 	mkdir -p SOURCES
-	$(if $($(package)-SVNPATH),\
-  cd SOURCES && svn export $($(package)-SVNPATH) $(package),\
-  cd SOURCES && cvs -d $(CVSROOT) export -r $(TAG) -d $(package) $(MODULE))
-else
-# multiple modules : iterate 
-SOURCES/$(package):
-	mkdir -p SOURCES/$(package) && cd SOURCES/$(package) && (\
-	$(foreach module,$(MODULE),\
-	 $(if $($(module)-SVNPATH), \
-  svn export $($(module)-SVNPATH) $(module), \
-  cvs -d $(if $($(module)-CVSROOT),$($(module)-CVSROOT),$(CVSROOT)) export -r $(TAG)  $(module);\
-         )))
-endif
+	cd SOURCES && cvs -d $(CVSROOT) export -r $(TAG) -d $(package) $(MODULE)
 
 # Make a hard-linked copy of the exported directory for each Source
 # defined in the spec file. However, our convention is that there
@@ -120,7 +97,7 @@ SOURCES/%.tar: SOURCES/%
 all: $(RPMS) $(SRPM)
 
 # Build RPMS
-$(RPMS): $(SPECFILE) $(SOURCES)
+$(RPMS): $(SPECFILE) $(SOURCES) .rpmmacros
 	mkdir -p BUILD RPMS
 	$(RPMBUILD) $(RPMFLAGS) -bb $<
 
@@ -131,7 +108,7 @@ $(wordlist 2,$(words $(RPMS)),$(RPMS)): $(firstword $(RPMS))
 endif
 
 # Build SRPM
-$(SRPM): $(SPECFILE) $(SOURCES)
+$(SRPM): $(SPECFILE) $(SOURCES) .rpmmacros
 	mkdir -p SRPMS
 	rpmbuild $(RPMFLAGS) -bs $<
 
@@ -149,13 +126,3 @@ clean:
 	$(MK) $(SPECFILE)
 
 .PHONY: all clean
-
-#################### convenience, for debugging only
-# make +foo : prints the value of $(foo)
-# make ++foo : idem but verbose, i.e. foo=$(foo)
-++%: varname=$(subst +,,$@)
-++%:
-	@echo $(varname)=$($(varname))
-+%: varname=$(subst +,,$@)
-+%:
-	@echo $($(varname))