[ardour-dev] [PATCH] dont prepend DESTDIR to hardcoded CONFIG_DIR usage in libardour

[Robert Jordens]

Hello!

[Mon, 04 Apr 2005] Taybin Rutkin wrote:
> Thanks.  I'll apply this.

Thanks. Here is another one. $DESTDIR got prepended in the hardcoded CONFIG_DIR in
libardour.

        Robert.

-- 
If a 'train station' is where a train stops, what's a 'workstation'?
-------------- next part --------------
Index: ardour-0.9beta28-scons/SConstruct
===================================================================
--- ardour-0.9beta28-scons.orig/SConstruct	2005-04-04 21:01:54.000000000 +0200
+++ ardour-0.9beta28-scons/SConstruct	2005-04-04 21:37:38.000000000 +0200
@@ -417,9 +417,11 @@
 install_prefix = '$DESTDIR/$PREFIX'
 
 if env['PREFIX'] == '/usr':
-    config_prefix = '$DESTDIR/etc'
+    final_config_prefix = '/etc'
 else:
-    config_prefix = '$DESTDIR/' + env['PREFIX'] + '/etc'
+    final_config_prefix = env['PREFIX'] + '/etc'
+
+config_prefix = '$DESTDIR' + final_config_prefix
 
 #
 # Compiler flags and other system-dependent stuff
@@ -528,7 +530,7 @@
 if env['NLS'] == 1:
     env.Append(CCFLAGS="-DENABLE_NLS")
 
-Export('env install_prefix final_prefix config_prefix libraries i18n')
+Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n')
 
 #
 # the configuration file may be system dependent
Index: ardour-0.9beta28-scons/libs/ardour/SConscript
===================================================================
--- ardour-0.9beta28-scons.orig/libs/ardour/SConscript	2005-04-04 21:33:19.000000000 +0200
+++ ardour-0.9beta28-scons/libs/ardour/SConscript	2005-04-04 21:36:40.000000000 +0200
@@ -3,7 +3,7 @@
 import os
 import glob
 
-Import('env final_prefix install_prefix config_prefix libraries i18n')
+Import('env final_prefix install_prefix final_config_prefix libraries i18n')
 
 ardour = env.Copy()
 
@@ -90,7 +90,7 @@
 
 ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 ardour.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+config_prefix+"\\\"")
+ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
 ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
 
 #
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.ardour.org/pipermail/ardour-dev-ardour.org/attachments/20050404/7535dd4e/attachment.pgp>