Merge branch 'master' of git@github.com:bschmalhofer/pipp

bschmalhofer · Apr 20, 2009 · 83422c3 · 83422c3
2 parents 0e5bea9 + f72b269
commit 83422c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -83,7 +83,11 @@ END
 );
 
 #  Done.
-done($config{'make'});
+if (not defined $config{'make'}) {
+    warn "missing field 'make' from parrot_config\n";
+} else {
+    done($config{'make'});
+}
 
 
 #  Process command line arguments into a hash.
@@ -143,7 +147,8 @@ sub create_files {
         }
 
         $config->{'win32_libparrot_copy'} = $^O eq 'MSWin32' ? 'copy $(BUILD_DIR)\libparrot.dll .' : '';
-        $content =~ s/@(\w+)@/$config->{$1}/g;
+        $content =~ s/@(\w+)@/
+            defined $config->{$1} ? $config->{$1} : (warn("'$1' is missing from parrot_config"), '')/ge;
         if ($^O eq 'MSWin32') {
             $content =~ s{/}{\\}g;
         }

diff --git a/README b/README
@@ -4,6 +4,9 @@ Pipp is Parrot's PHP.
 Pipp is an implementation of the language PHP that runs on Parrot.
 Pipp is implemtented with the Parrot Compiler Toolkit.
 
+Run 'perl Configure.pl' for creating the Makefile or
+    'perl Confgure.pl --gen-parrot' to fetch and build Parrot before
+    creating the Makefile.
 Run 'make test' for building and running the tests in the directory F<t>.
 Run 'make smoke' for testing and submitting the test result to
 http://smolder.plusthree.com/app/public_projects/smoke_reports/10