summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames O'Gorman <james@netinertia.co.uk>2008-11-22 15:28:11 +0000
committerJames O'Gorman <james@netinertia.co.uk>2008-11-22 15:28:11 +0000
commit84696a75cbc54fed675e21b89c97885bc2943ca3 (patch)
tree3b75e6addd9598021b547b856d16f710e414e8b0
parent4a6ecbec43cefacec7e3910dcb8914f4c8c972c8 (diff)
Allow use of literal paths in parcels.txt (i.e. files to be installed outside of $prefix)
-rwxr-xr-xinfrastructure/makeparcels.pl.in10
1 files changed, 9 insertions, 1 deletions
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in
index b423651c..ba22ad62 100755
--- a/infrastructure/makeparcels.pl.in
+++ b/infrastructure/makeparcels.pl.in
@@ -237,7 +237,15 @@ EOF
my $local_install_dir = $install_into_dir;
if (defined $dest)
{
- $local_install_dir = "@prefix@/$dest";
+ if ($dest =~ m,^/,)
+ {
+ # Don't add $prefix if $dest is a literal path
+ $local_install_dir = $dest;
+ }
+ else
+ {
+ $local_install_dir = "@prefix@/$dest";
+ }
}
print SCRIPT "mkdir -p " .
"\${DESTDIR}$local_install_dir/\n";