conversion nqp to nqp-rx

Makefile.in

@@ -12,8 +12,6 @@ MANDIR        := @mandir@$(VERSION)
 
 # Various paths
 PERL6GRAMMAR  := $(LIB_DIR)/library/PGE/Perl6Grammar.pbc
-NQP           := $(LIB_DIR)/languages/nqp/nqp.pbc
-PCT           := $(LIB_DIR)/library/PCT.pbc
 
 ## Setup some commands
 MAKE          := @make_c@
@@ -24,6 +22,7 @@ MKPATH        := @mkpath@
 RM_F          := @rm_f@
 RM_RF         := @rm_rf@
 POD2MAN       := pod2man
+NQP           := $(BIN_DIR)/parrot-nqp@exe@
 PARROT        := $(BIN_DIR)/parrot@exe@
 #IF(darwin):
 #IF(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
@@ -58,7 +57,7 @@ BUILD_CLEANUPS := \
 #IF(win32):  "setup-parrot-*.exe" \
 
 # the default target
-build: xml.pbc xml/sax/xml.pbc xml/handler/xmlwriter.pbc
+build: xml/sax/xml.pbc xml/handler/xmlwriter.pbc
 
 all: build
 
@@ -70,16 +69,16 @@ xml/sax/xml/grammar_gen.pir: $(PERL6GRAMMAR) xml/sax/xml/grammar.pg
 	    --output=xml/sax/xml/grammar_gen.pir \
 	    xml/sax/xml/grammar.pg
 
-xml/sax/xml/actions_gen.pir: $(NQP) xml/sax/xml/actions.pm
-	$(PARROT) $(PARROT_ARGS) $(NQP) --output=xml/sax/xml/actions_gen.pir \
-	    --target=pir xml/sax/xml/actions.pm
+xml/sax/xml/actions_gen.pir: xml/sax/xml/actions.nqp
+	$(NQP) --output=xml/sax/xml/actions_gen.pir \
+	    --target=pir xml/sax/xml/actions.nqp
 
 xml/handler/xmlwriter.pbc: $(HANDLER_XMLWRITER_SOURCES)
 	$(PARROT) $(PARROT_ARGS) -o xml/handler/xmlwriter.pbc xml/handler/xmlwriter.pir
 
-xml/handler/xmlwriter/actions_gen.pir: $(NQP) xml/handler/xmlwriter/actions.pm
-	$(PARROT) $(PARROT_ARGS) $(NQP) --output=xml/handler/xmlwriter/actions_gen.pir \
-	    --target=pir xml/handler/xmlwriter/actions.pm
+xml/handler/xmlwriter/actions_gen.pir: xml/handler/xmlwriter/actions.nqp
+	$(NQP) --output=xml/handler/xmlwriter/actions_gen.pir \
+	    --target=pir xml/handler/xmlwriter/actions.nqp
 
 Makefile: Makefile.in
 	$(PARROT) Configure.pir

setup.pir

@@ -29,9 +29,9 @@ No Configure step, no Makefile generated.
     $P0['pir_pge'] = $P1
 
     $P2 = new 'Hash'
-    $P2['xml/sax/xml/actions_gen.pir'] = 'xml/sax/xml/actions.pm'
-    $P2['xml/handler/xmlwriter/actions_gen.pir'] = 'xml/handler/xmlwriter/actions.pm'
-    $P0['pir_nqp'] = $P2
+    $P2['xml/sax/xml/actions_gen.pir'] = 'xml/sax/xml/actions.nqp'
+    $P2['xml/handler/xmlwriter/actions_gen.pir'] = 'xml/handler/xmlwriter/actions.nqp'
+    $P0['pir_nqp-rx'] = $P2
 
     $P3 = new 'Hash'
     $P4 = split "\n", <<'SOURCES'