ppcrcd/trunk/Makefile

[sparky]

Author: sparky
Date: Fri Jan  6 21:54:45 2006
New Revision: 6752

Modified:
   ppcrcd/trunk/Makefile
Log:
- fixes nr1


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Fri Jan  6 21:54:45 2006
@@ -9,7 +9,7 @@
 
 INITRDMODULES = cdrom ide-cd isofs nls_base
 
-OUT = $(PWD)/out
+OUT = out
 S = $(OUT)/rpm/SPECS
 R = $(OUT)/rpm/rpms
 P = $(OUT)/rpm/prep
@@ -19,9 +19,7 @@
 include base.pkgs
 #include add.pkgs
 
-INSTALL = $(addprefix $(installed_dir)/,$(I))
-STOP = $(addprefix $(touch)/stop/,$(S))
-
+installed_dir = $(OUT)/rpm/installed
 ppcrcd_iso = $(OUT)/ppcrcd.iso
 cdroot = $(OUT)/cdroot
 boot = $(OUT)/boot
@@ -34,6 +32,9 @@
 root_inst = $(OUT)/root/inst
 sources = $(OUT)/rpm/sources
 
+INSTALL = $(addprefix $(installed_dir)/,$(I))
+STOP = $(addprefix $(touch)/stop/,$(S))
+
 $(ppcrcd_iso):	$(cdroot) $(boot)/hfs.map files.sort
 	$(SU) mkisofs \
 		-disable-deep-relocation	\
@@ -56,7 +57,7 @@
 $(cdroot):	$(ppcrcd_sqf) $(boot) bootinfo.txt
 	rm -rf $@{,.work}
 	mkdir -p $@.work/ppc
-	ln -s $(ppcrcd_sqf) $@.work
+	ln -s $(PWD)/$(ppcrcd_sqf) $@.work
 	cp -a $(boot) $@.work
 	cp -a bootinfo.txt $@.work/boot/ofboot.b
 	ln -s $(PWD)/bootinfo.txt $@.work/ppc
@@ -171,10 +172,7 @@
 	mkdir $@
 	$(SU) rpm --root=$@ --initdb
 
-installed_dir = $(OUT)/rpm/installed
-rpms_dir = $(OUT)/rpm/rpms
-
-$(installed_dir)/%:	$(rpms_dir)/% $(root_inst)
+$(installed_dir)/%:	$(R)/% $(root_inst)
 	@$(SU) rpm -Uhv --root=$(root_inst) `cat $(firstword $^)`	\
 		$(INSTOPTS-$(notdir $@)) --define="_install_langs %{nil}"
 	@touch $@
@@ -205,13 +203,13 @@
 	#######################################################################
 	###	Getting $(notdir $@) source
 	#######################################################################
-	cd rpm/SPECS && ./builder -g $(firstword $^)	\
+	cd $(OUT)/rpm/SPECS && ./builder -g $(firstword $^)	\
 		$(if $(REV-$(notdir $@)),-r $(REV-$(notdir $@)),) \
 		--define _topdir $(OUT)/rpm	\
-		$(BCOND-$(notdir $@)) $(BCOND)		\
+		$(BCOND-$(notdir $@)) $(BCOND)
 	touch $@
 
-$(S)/%.spec: $(touch)/builder_prepared
+$(OUT)/rpm/SPECS/%.spec: $(touch)/builder_prepared
 	cd $(dir $@) && cvs up $(if $(REV-$(@:$(S)/%.spec=%)),-r \
 		$(REV-$(@:$(S)/%.spec=%)),-A) $(notdir $@)