More fixes to Configure.pl and makefiles

rakudo · Feb 8, 2009 · 577566e · 577566e
1 parent 7ab01c5
commit 577566e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -23,16 +23,17 @@
 
 #  If we're in a Parrot build tree and --parrot-config isn't
 #  specified, use the build tree's reconfigure.pl and exit.
-if (!$options{'parrot-config'} && -e "../../tools/dev/reconfigure.pl") {
-    print "Building Makefile with ../../tools/dev/reconfigure.pl\n";
-    chdir '../..';
-    `$^X -Ilib tools/dev/reconfigure.pl --step=gen::languages --languages=rakudo`;
-    done();
-}
+# if (!$options{'parrot-config'} && -e "../../tools/dev/reconfigure.pl") {
+#     print "Building Makefile with ../../tools/dev/reconfigure.pl\n";
+#     chdir '../..';
+#     `$^X -Ilib tools/dev/reconfigure.pl --step=gen::languages --languages=rakudo`;
+#     done();
+# }
 
 
 #  Get a list of parrot-configs to invoke.
-my @parrot_config_exe = qw(parrot/parrot_config parrot_config);
+my @parrot_config_exe = 
+    qw(parrot/parrot_config parrot_config ../../parrot_config);
 if ($options{'parrot-config'} && $options{'parrot-config'} ne '1') {
     @parrot_config_exe = ($options{'parrot-config'});
 }

diff --git a/build/Makefile.in b/build/Makefile.in
@@ -296,10 +296,9 @@ help:
 	@echo ""
 	@echo "Misc:"
 	@echo "  help:              Print this help message."
-	@echo "  Makefile:          Regenerate the Makefile."
 	@echo ""
 
 # regenerate the Makefile
-Makefile: config/makefiles/root.in config/makefiles/utils.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=perl6
+# Makefile: config/makefiles/root.in config/makefiles/utils.in
+# 	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=perl6