jdahlin - r7186 - in flumotion/trunk: . flumotion/configure

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Tue Aug  5 13:34:18 2008
New Revision: 7186

Log:
2008-08-05  Johan Dahlin  <johan at flumotion.com>

    * flumotion/configure/installed.py.in:
    Use variables everywhere, to avoid using more than 79 characters
    when building in buildbot.



Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/configure/installed.py.in

Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Tue Aug  5 13:34:18 2008
@@ -1,5 +1,11 @@
 2008-08-05  Johan Dahlin  <johan at flumotion.com>
 
+	* flumotion/configure/installed.py.in:
+	Use variables everywhere, to avoid using more than 79 characters
+	when building in buildbot.
+
+2008-08-05  Johan Dahlin  <johan at flumotion.com>
+
 	* Makefile.am:
 	dist misc/pep8.py
 

Modified: flumotion/trunk/flumotion/configure/installed.py.in
==============================================================================
--- flumotion/trunk/flumotion/configure/installed.py.in	(original)
+++ flumotion/trunk/flumotion/configure/installed.py.in	Tue Aug  5 13:34:18 2008
@@ -24,6 +24,13 @@
 
 
 def get():
+    bindir = '@BINDIR@'
+    datadir = '@DATADIR@'
+    localstatedir = '@LOCALSTATEDIR@'
+    libdir = '@LIBDIR@'
+    sbindir = '@SBINDIR@'
+    sysconfdir = '@SYSCONFDIR@'
+
     if 'FLU_CACHE_DIR' in os.environ:
         cachedir = os.path.realpath(os.environ['FLU_CACHE_DIR'])
         daemondir = cachedir
@@ -33,17 +40,10 @@
         daemondir = homedir
     else:
         cachedir = os.path.join(
-            '@LOCALSTATEDIR@', 'cache', 'flumotion',
+            localstatedir, 'cache', 'flumotion',
             '.flumotion')
         daemondir = os.path.join(
-            '@LOCALSTATEDIR@', 'cache', 'flumotion')
-
-    bindir = '@BINDIR@'
-    datadir = '@DATADIR@'
-    localstatedir = '@LOCALSTATEDIR@'
-    libdir = '@LIBDIR@'
-    sbindir = '@SBINDIR@'
-    sysconfdir = '@SYSCONFDIR@'
+            localstatedir, 'cache', 'flumotion')
 
     return {
         'isinstalled': True,