typo in BootstrapFS dependency

[build.git] / Rules.mk

diff --git a/Rules.mk b/Rules.mk
index 473a4e1..03341cf 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.34 2007/07/19 20:39:33 mef Exp $
+# $Id: Rules.mk,v 1.37 2007/09/10 22:24:20 mef Exp $
 #
 
 # Base rpmbuild in the current directory
@@ -16,6 +16,13 @@ export CVSROOT CVS_RSH
 #
 
 SPECFILE := SPECS/$(notdir $(SPEC))
+MULTI_MODULE := $(word 2,$(MODULE))
+# is there a single module ? to mimick cvs export -d behaviour
+ifeq "$(MULTI_MODULE)" ""
+       _MAINMODULE := $(MODULE)
+else
+       _MAINMODULE := $(firstword $(MODULE))
+endif 
 
 $(SPECFILE):
        mkdir -p SPECS
@@ -27,10 +34,13 @@ 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) >> $@)
-
+       $(if $($(package)-CVSROOT), cvs -d $($(package)-CVSROOT) checkout -r $(TAG) -p $(_MAINMODULE)/$(SPEC) >> $@; ,\
+         $(if $($(package)-SVNPATH), svn cat $($(package)-SVNPATH)/$(_MAINMODULE)/$(TAG)/$(SPEC) >> $@; ,\
+           $(if $(CVSROOT), cvs -d $(CVSROOT) checkout -r $(TAG) -p $(_MAINMODULE)/$(SPEC) >> $@; ,\
+             $(if $(SVNPATH), svn cat $(SVNPATH)/$(_MAINMODULE)/$(TAG)/$(SPEC) >> $@; ) \
+            )\
+          )\
+        )
 
 #
 # Parse spec file into Makefile fragment
@@ -68,23 +78,32 @@ SOURCEDIRS := $(call stripext,$(SOURCES))
 # 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))
+       mkdir -p SOURCES && cd SOURCES && \
+        (\
+        $(if $($(package)-CVSROOT), cvs -d $($(package)-CVSROOT) export -r $(TAG) -d $(package) $(MODULE); ,\
+          $(if $($(package)-SVNPATH), svn export $($(package)-SVNPATH)/$(MODULE)/$(TAG) $(package) ; ,\
+            $(if $(CVSROOT), cvs -d $(CVSROOT) export -r $(TAG) -d $(package) $(MODULE); ,\
+              $(if $(SVNPATH), svn export $(SVNPATH)/$(MODULE)/$(TAG) $(package) ;) \
+             )\
+           )\
+         )\
+        )
 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);\
-         )))
+       mkdir -p SOURCES/$(package) && cd SOURCES/$(package) && \
+        $(foreach module,$(MODULE),\
+          $(if $($(module)-CVSROOT), cvs -d $($(module)-CVSROOT) export -r $(TAG) -d $(module) $(module); ,\
+            $(if $($(module)-SVNPATH), svn export $($(module)-SVNPATH)/$(module)/$(TAG) $(module) ; ,\
+              $(if $(CVSROOT), cvs -d $(CVSROOT) export -r $(TAG) -d $(module) $(module); ,\
+                $(if $(SVNPATH), svn export $(SVNPATH)/$(module)/$(TAG) $(module) ;) \
+               )\
+             )\
+           )\
+         )
 endif
 
 # Make a hard-linked copy of the exported directory for each Source
@@ -120,7 +139,7 @@ SOURCES/%.tar: SOURCES/%
 all: $(RPMS) $(SRPM)
 
 # Build RPMS
-$(RPMS): $(SPECFILE) $(SOURCES) .rpmbuild.sh
+$(RPMS): $(SPECFILE) $(SOURCES)
        mkdir -p BUILD RPMS
        $(RPMBUILD) $(RPMFLAGS) -bb $<
 
@@ -131,7 +150,7 @@ $(wordlist 2,$(words $(RPMS)),$(RPMS)): $(firstword $(RPMS))
 endif
 
 # Build SRPM
-$(SRPM): $(SPECFILE) $(SOURCES) .rpmbuild.sh
+$(SRPM): $(SPECFILE) $(SOURCES)
        mkdir -p SRPMS
        $(RPMBUILD) $(RPMFLAGS) -bs $<
 
@@ -140,12 +159,6 @@ $(SRPM): $(SPECFILE) $(SOURCES) .rpmbuild.sh
        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 \