Author: rieggepp
Date: Mon Jun 23 09:15:08 2008
New Revision: 122

Modified:
   trunk/tools/rebuild_stages/Makefile

Log:
Some bugfixes.

Modified: trunk/tools/rebuild_stages/Makefile
==============================================================================
--- trunk/tools/rebuild_stages/Makefile	(original)
+++ trunk/tools/rebuild_stages/Makefile	Mon Jun 23 09:15:08 2008
@@ -9,7 +9,7 @@

 # Autogenerated Configuration Files
 CATALYST_CONF = catalyst.conf
-CATALYST_RC = catalyst.rc
+CATALYST_RC = catalystrc

 # Stage Target Filenames
 STAGE1    = stage1-$(SUBARCH)-$(VERSION).tar.bz2
@@ -195,35 +195,35 @@
 	mkdir -p $(CATALYST_STORE_DIR)/snapshots
 	cp "$(PORTAGE_SNAPSHOT)" "$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2"

-$(STAGEDIR)/$(STAGE1): $(STAGE1_SPEC) $(STAGEDIR)/$(SEEDSTAGE) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+$(STAGEDIR)/$(STAGE1): $(STAGE1_SPEC) $(STAGEDIR)/$(SEEDSTAGE) 
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF)
 	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE1_SPEC)

 $(STAGE1): $(STAGEDIR)/$(STAGE1)
 	cp "$(STAGEDIR)/$(STAGE1)" $@

-$(STAGEDIR)/$(STAGE2): $(STAGE2_SPEC) $(STAGEDIR)/$(STAGE1) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+$(STAGEDIR)/$(STAGE2): $(STAGE2_SPEC) $(STAGEDIR)/$(STAGE1) 
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF)
 	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE2_SPEC)

 $(STAGE2): $(STAGEDIR)/$(STAGE2)
 	cp "$(STAGEDIR)/$(STAGE2)" $@

-$(STAGEDIR)/$(STAGE3): $(STAGE3_SPEC) $(STAGEDIR)/$(STAGE2) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+$(STAGEDIR)/$(STAGE3): $(STAGE3_SPEC) $(STAGEDIR)/$(STAGE2) 
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF)
 	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE3_SPEC)

 $(STAGE3): $(STAGEDIR)/$(STAGE3)
 	cp "$(STAGEDIR)/$(STAGE3)" $@

-$(STAGEDIR)/$(STAGE4): $(STAGE4_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+$(STAGEDIR)/$(STAGE4): $(STAGE4_SPEC) $(STAGEDIR)/$(STAGE3) 
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF)
 	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE4_SPEC)

 $(STAGE4): $(STAGEDIR)/$(STAGE4)
 	cp "$(STAGEDIR)/$(STAGE4)" $@

-livecd-stage1: $(LIVECD_STAGE1_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+livecd-stage1: $(LIVECD_STAGE1_SPEC) $(STAGEDIR)/$(STAGE3) 
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF)
 	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(LIVECD_STAGE1_SPEC)

-livecd-stage2: $(LIVECD_STAGE2_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+livecd-stage2: $(LIVECD_STAGE2_SPEC) $(STAGEDIR)/$(STAGE3) 
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF)
 	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(LIVECD_STAGE2_SPEC)

-tinderbox: $(TINDERBOX_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+tinderbox: $(TINDERBOX_SPEC) $(STAGEDIR)/$(STAGE3) 
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF)
 	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(TINDERBOX_SPEC)
-- 
gnap-dev@g.o mailing list