ppcrcd/trunk/Makefile

[sparky]

Author: sparky
Date: Wed Jul 12 02:29:26 2006
New Revision: 7508

Modified:
   ppcrcd/trunk/Makefile
Log:
- one more try to make woek both .NOTPARALLEL: and .SECONDARY:
- some other changes


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Wed Jul 12 02:29:26 2006
@@ -18,6 +18,7 @@
 
 R = out/rpm/rpms
 P = out/rpm/prep
+V := @
 
 .PHONY:	all
 all:	out/ppcrcd.iso
@@ -215,8 +216,8 @@
 	sleep 1 && touch $@ && sleep 1
 
 out/rpm/installed/%:	out/rpm/rpms/% $(root_inst)
-	@$(SU) rpm -Uhv --root=$(PWD)/$(root_inst) out/rpm/RPMS/`cat $(firstword $^)`  \
-		$(INSTOPTS-$(notdir $@)) --define="_install_langs %{nil}" --replacepkgs
+	$(V)$(SU) rpm -Uhv --root=$(PWD)/$(root_inst) out/rpm/RPMS/`cat $(firstword $^)`  \
+		$(INSTOPTS-$(notdir $@)) --define="_install_langs %{nil}" --replacepkgs --replacefiles
 	touch $@
 
 .PHONY:	%.rpm
@@ -413,10 +414,11 @@
 .PHONY:	%/ \./%
 %/:	%
 \./%:	%
+$(PWD)/%:	%
 	
 .DELETE_ON_ERROR: $(ppcrcd_iso) $(ppcrcd_sqf) $(initrd_sqf) \
 		$(vmlinuz) $(vmlinux) out/docs/index.html
 	
-.NOTPARALLEL:
+.NOTPARALLEL:	out/rpm/installed/%
 
-.SECONDARY:	out/rpm/SPECS/%.spec
+.SECONDARY: