ppcrcd/trunk/Makefile

[sparky]

Author: sparky
Date: Thu Apr 20 13:28:49 2006
New Revision: 7362

Modified:
   ppcrcd/trunk/Makefile
Log:
- automatic instalation fixed


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Thu Apr 20 13:28:49 2006
@@ -246,7 +246,7 @@
 	for RPM in `sed -n '/^Wrote:/s at Wrote: .*/@@ p' buildout`; do	\
 		PKG=`echo $$RPM | sed -e 's at .*/@@g' -e 's/-[^-]*-[^-]*$$//'`; \
 		echo $$RPM > $(R)/$$PKG;		\
-		rpm -q $$PKG && echo $$RPM >> RPMlist;		\
+		rpm -q $$PKG >/dev/null && echo $$RPM >> RPMlist || :;		\
 	done
 	rm buildout EXIT
 	$(if $(DONTREMOVE),,-rm -rf out/rpm/BUILD/*)
@@ -254,7 +254,7 @@
 	$(if $(NOTEQ-$(notdir $(firstword $^))), rm -f \
 		out/touch/$(NOTEQ-$(notdir $(firstword $^))),#)
 	sleep 1 && touch $@ && sleep 1
-	-$(SU) rpm -Uhv --replacepkgs out/rpm/RPMS/`cat RPMlist`
+	-$(SU) rpm -Uhv --replacepkgs `cat RPMlist | sed 's@^@out/rpm/RPMS/@'`
 	rm -f RPMlist
 
 out/rpm/prep/%:	out/rpm/sources/%