[Box Backup-commit] COMMIT r2380 - box/trunk/infrastructure

boxbackup-dev@boxbackup.org boxbackup-dev@boxbackup.org
Sat, 22 Nov 2008 15:28:12 +0000 (GMT)


Author: jamesog
Date: 2008-11-22 15:28:11 +0000 (Sat, 22 Nov 2008)
New Revision: 2380

Modified:
   box/trunk/infrastructure/makeparcels.pl.in
Log:
Allow use of literal paths in parcels.txt (i.e. files to be installed outside of $prefix)


Modified: box/trunk/infrastructure/makeparcels.pl.in
===================================================================
--- box/trunk/infrastructure/makeparcels.pl.in	2008-11-22 14:33:25 UTC (rev 2379)
+++ box/trunk/infrastructure/makeparcels.pl.in	2008-11-22 15:28:11 UTC (rev 2380)
@@ -237,7 +237,15 @@
 			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";