[svn:parrot] r26140 - trunk/config/gen/makefiles

Author: jkeenan
Date: Fri Feb 29 18:43:27 2008
New Revision: 26140

Modified:
   trunk/config/gen/makefiles/json.in
   trunk/config/gen/makefiles/nqp.in
   trunk/config/gen/makefiles/pge.in
   trunk/config/gen/makefiles/pirc.in
   trunk/config/gen/makefiles/tge.in

Log:
Applying patch submitted by mkraai in RT #51170 ([PATCH] Use rm -f instead of
rm -rf to remove files).   Thanks, Matt.


Modified: trunk/config/gen/makefiles/json.in
==============================================================================
--- trunk/config/gen/makefiles/json.in	(original)
+++ trunk/config/gen/makefiles/json.in	Fri Feb 29 18:43:27 2008
@@ -1,7 +1,7 @@
 # $Id$
 
 PERL     = @perl@
-RM_RF    = @rm_rf@
+RM_F     = @rm_f@
 PARROT   = ../../parrot@exe@
 
 TOOL_DIR = ../..
@@ -33,7 +33,7 @@
 	cd $(TOOL_DIR) && prove -r t/compilers/json
 
 testclean:
-	$(RM_RF) "../../t/compilers/json/*.pir" \
+	$(RM_F) "../../t/compilers/json/*.pir" \
 
 JSON.pbc : JSON/grammar.pbc JSON/pge2pir.pbc JSON.pir
 	$(PARROT) --output=JSON.pbc JSON.pir

Modified: trunk/config/gen/makefiles/nqp.in
==============================================================================
--- trunk/config/gen/makefiles/nqp.in	(original)
+++ trunk/config/gen/makefiles/nqp.in	Fri Feb 29 18:43:27 2008
@@ -3,7 +3,7 @@
 # Setup some commands
 LN_S     = @lns@
 PERL     = @perl@
-RM_RF    = @rm_rf@
+RM_F     = @rm_f@
 PARROT   = ../../parrot@exe@
 TOOL_DIR = ../..
 CP       = @cp@
@@ -56,9 +56,9 @@
 
 
 clean:
-	$(RM_RF) $(CLEANUPS)
+	$(RM_F) $(CLEANUPS)
 
 realclean: clean
-	$(RM_RF) Makefile
+	$(RM_F) Makefile
 
 distclean: realclean

Modified: trunk/config/gen/makefiles/pge.in
==============================================================================
--- trunk/config/gen/makefiles/pge.in	(original)
+++ trunk/config/gen/makefiles/pge.in	Fri Feb 29 18:43:27 2008
@@ -3,7 +3,7 @@
 # Setup some commands
 LN_S     = @lns@
 PERL     = @perl@
-RM_RF    = @rm_rf@
+RM_F     = @rm_f@
 PARROT   = ../../parrot@exe@
 TOOL_DIR = ../..
 CP       = @cp@
@@ -29,7 +29,7 @@
 	$(CP) PGE.pbc $(PARROT_LIBRARY)
 
 PGE.pbc: $(PARROT) $(SOURCES)
-	$(RM_RF) PGE.pbc $(PARROT_LIBRARY)/PGE.pbc
+	$(RM_F) PGE.pbc $(PARROT_LIBRARY)/PGE.pbc
 	$(PERL) -e "" >PGE/builtins_gen.pir
 	$(PARROT) -o PGE.pbc --output-pbc PGE.pir
 	$(PARROT) $(PARROT_LIBRARY)/PGE/Perl6Grammar.pir  --output=PGE/builtins_gen.pir PGE/builtins.pg
@@ -59,20 +59,20 @@
 	cd $(TOOL_DIR); prove -r t/compilers/pge
 
 testclean:
-	$(RM_RF) "../../t/compilers/pge/*.pir" \
+	$(RM_F) "../../t/compilers/pge/*.pir" \
 	    "../../t/compilers/pge/p5regex/*.pir" \
 	    "../../t/compilers/pge/p6regex/*.pir"
-	$(RM_RF) "../../t/compilers/pge/*.pbc" \
+	$(RM_F) "../../t/compilers/pge/*.pbc" \
 	    "../../t/compilers/pge/p5regex/*.pbc" \
 	    "../../t/compilers/pge/p6regex/*.pbc"
 
 clean: testclean
-	$(RM_RF) \
+	$(RM_F) \
     PGE.pbc \
     $(PARROT_LIBRARY)/PGE.pbc \
     PGE/builtins_gen.pir
 
 realclean: clean
-	$(RM_RF) Makefile
+	$(RM_F) Makefile
 
 distclean: realclean

Modified: trunk/config/gen/makefiles/pirc.in
==============================================================================
--- trunk/config/gen/makefiles/pirc.in	(original)
+++ trunk/config/gen/makefiles/pirc.in	Fri Feb 29 18:43:27 2008
@@ -3,7 +3,6 @@
 # Setup some commands
 LN_S          = @lns@
 PERL          = @perl@
-RM_RF         = @rm_rf@
 RM_F          = @rm_f@
 PARROT        = ../../parrot@exe@
 TOOL_DIR      = ../..
@@ -119,7 +118,7 @@
 	$(RM_F) *$(O)
 
 realclean: clean
-	$(RM_RF) \
+	$(RM_F) \
   Makefile \
   pirc$(EXE) \
   doc/*.html

Modified: trunk/config/gen/makefiles/tge.in
==============================================================================
--- trunk/config/gen/makefiles/tge.in	(original)
+++ trunk/config/gen/makefiles/tge.in	Fri Feb 29 18:43:27 2008
@@ -3,7 +3,7 @@
 # Setup some commands
 LN_S     = @lns@
 PERL     = @perl@
-RM_RF    = @rm_rf@
+RM_F     = @rm_f@
 PARROT   = ../../parrot@exe@
 PGE_DIR   = ../../compilers/pge
 CP       = @cp@
@@ -62,10 +62,10 @@
 	prove -r ../../t/compilers/tge
 
 testclean:
-	$(RM_RF) "../../t/compilers/tge/*.pir"
+	$(RM_F) "../../t/compilers/tge/*.pir"
 
 clean: testclean
-	$(RM_RF) TGE.pbc \
+	$(RM_F) TGE.pbc \
 	TGE/Rule.pbc \
 	TGE/Parser.pir \
 	TGE/Parser.pbc \
@@ -75,6 +75,6 @@
 	$(PARROT_LIBRARY)/TGE.pbc
 
 realclean: clean
-	$(RM_RF) Makefile
+	$(RM_F) Makefile
 
 distclean: realclean

• [svn:parrot] r26140 - trunk/config/gen/makefiles by jkeenan