Permalink
Browse files

Add a --prefix argument to Configure.pl to set the installation prefix

git-svn-id: https://svn.parrot.org/parrot/trunk@6743 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent 61a800d commit 20fed4ce383aab2a8a9c06f8f19a151613e90d2d Nicholas Clark committed Oct 2, 2004
Showing with 11 additions and 3 deletions.
  1. +5 −0 Configure.pl
  2. +1 −1 config/gen/makefiles/root.in
  3. +5 −2 config/init/data.pl
View
5 Configure.pl
@@ -47,6 +47,10 @@ =head2 Command-line Options
Tells Configure.pl not to run the MANIFEST check.
+=item C<--prefix>
+
+Sets the location where parrot will be installed.
+
=item C<--ask>
This turns on the user prompts.
@@ -300,6 +304,7 @@ END
--verbose-step=N Set verbose for step N only
--verbose-step=regex Set verbose for step matching description
--nomanicheck Don't check the MANIFEST
+ --prefix Set the installation prefix
--ask Have Configure ask for commonly-changed info
View
2 config/gen/makefiles/root.in
@@ -11,7 +11,7 @@ VERSION = ${VERSION}${DEVEL}
# Override at least PREFIX with the install location if you're going
# to be using this outside of your build area.
BUILDPREFIX =
-PREFIX = /usr/local/parrot-$(VERSION)
+PREFIX = ${prefix}
EXEC_PREFIX = $(PREFIX)
BINDIR = $(EXEC_PREFIX)/bin
LIBDIR = $(EXEC_PREFIX)/lib
View
7 config/init/data.pl
@@ -24,10 +24,10 @@ package Configure::Step;
$description="Setting up Configure's data structures...";
-@args=('debugging', 'optimize', 'profile', 'verbose');
+@args=('debugging', 'optimize', 'profile', 'verbose', 'prefix');
sub runstep {
- my ($debugging, $optimize, $profile, $verbose) = @_;
+ my ($debugging, $optimize, $profile, $verbose, $prefix) = @_;
package Configure::Data;
use Config;
@@ -144,6 +144,9 @@ sub runstep {
);
+ $prefix = "/usr/local/parrot-$c{VERSION}$c{DEVEL}" unless defined $prefix;
+ $c{prefix} = $prefix;
+
my (%triggers);
# add profiling if needed

0 comments on commit 20fed4c

Please sign in to comment.