[Box Backup-dev] COMMIT r413 - in box/trunk: . infrastructure

[boxbackup-dev at fluffy.co.uk]

Author: martin
Date: 2006-02-11 02:28:52 +0000 (Sat, 11 Feb 2006)
New Revision: 413

Modified:
   box/trunk/configure.ac
   box/trunk/infrastructure/BoxPlatform.pm.in
Log:
Workaround for autoconf's unexpanded directory substitutions vs. the current Makefile not being able to expand them itself.

Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac	2006-02-08 20:39:44 UTC (rev 412)
+++ box/trunk/configure.ac	2006-02-11 02:28:52 UTC (rev 413)
@@ -175,7 +175,19 @@
   LIBS="-Wl,-Bstatic $LIBS -Wl,-Bdynamic"
 fi
 
+## Kludge to allow makeparcels.pl to use bindir. This is not a good long term
+## solution because it prevents use of "make exec_prefix=/some/dir"
+saved_prefix=$prefix
+saved_exec_prefix=$exec_prefix
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+bindir_expanded=`eval "echo $bindir"`
+bindir_expanded=`eval "echo $bindir_expanded"`
+prefix=$saved_prefix
+exec_prefix=$saved_exec_prefix
+AC_SUBST([bindir_expanded])
 
+
 ### Output files
 AC_CONFIG_FILES([infrastructure/BoxPlatform.pm])
 AC_OUTPUT

Modified: box/trunk/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/trunk/infrastructure/BoxPlatform.pm.in	2006-02-08 20:39:44 UTC (rev 412)
+++ box/trunk/infrastructure/BoxPlatform.pm.in	2006-02-11 02:28:52 UTC (rev 413)
@@ -13,9 +13,9 @@
 	chomp $build_cpu;
 	# Cygwin Builds usually something like CYGWIN_NT-5.0, CYGWIN_NT-5.1
 	# Box Backup tried on Win2000,XP only :)
-	
-    $build_os = 'CYGWIN' if $build_os =~ m/CYGWIN/;
 
+	$build_os = 'CYGWIN' if $build_os =~ m/CYGWIN/;
+
 	$make_command = ($build_os eq 'Darwin') ? 'bsdmake' : ($build_os eq 'SunOS') ? 'gmake' : 'make';
 	$bsd_make = ($build_os ne 'Linux' && $build_os ne 'CYGWIN' && $build_os ne "SunOS");
 
@@ -34,10 +34,10 @@
 	$product_name = <VERSION>;
 	chomp $product_name;
 	close VERSION;
-	
+
 	# where to put the files
-	$install_into_dir = '@bindir@';
-	
+	$install_into_dir = '@bindir_expanded@';
+
 	# if it's Darwin,
 	if($build_os eq 'Darwin')
 	{