From 84696a75cbc54fed675e21b89c97885bc2943ca3 Mon Sep 17 00:00:00 2001
From: James O'Gorman <james@netinertia.co.uk>
Date: Sat, 22 Nov 2008 15:28:11 +0000
Subject: Allow use of literal paths in parcels.txt (i.e. files to be installed
 outside of $prefix)

---
 infrastructure/makeparcels.pl.in | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'infrastructure/makeparcels.pl.in')

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";
-- 
cgit v1.2.3