billreminder r652 - in trunk: . src/lib

[ogmaciel svn gnome org]

Author: ogmaciel
Date: Sat Sep 27 01:29:17 2008
New Revision: 652
URL: http://svn.gnome.org/viewvc/billreminder?rev=652&view=rev

Log:
Fixes bug #553890.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/lib/Makefile.am
   trunk/src/lib/common.py
   trunk/src/lib/defs.py.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Sep 27 01:29:17 2008
@@ -1,3 +1,9 @@
+BillReminder 0.3.x
+==================
+
+Backend:
+  * Fixed an issue where datadir was hard coded to '/usr/share' (Bug #553890).
+
 BillReminder 0.3.2
 ==================
 

Modified: trunk/src/lib/Makefile.am
==============================================================================
--- trunk/src/lib/Makefile.am	(original)
+++ trunk/src/lib/Makefile.am	Sat Sep 27 01:29:17 2008
@@ -18,14 +18,15 @@
 	utils.py
 
 defs.py: defs.py.in
-	sed -e s!\ VERSION\@!$(VERSION)! \
-	< $< > $@
+	sed						\
+		-e s!\ datadir\@!$(datadir)!		\
+		-e s!\ VERSION\@!$(VERSION)!		\
+		< $< > $@
+defs.py: Makefile
+
+CLEANFILES = defs.py
+EXTRA_DIST = defs.py.in
 
-CLEANFILES = \
-	defs.py
-	
 DISTCLEANFILES = \
 	$(CLEANFILES)
-	
-EXTRA_DIST = \
-	defs.py.in
+

Modified: trunk/src/lib/common.py
==============================================================================
--- trunk/src/lib/common.py	(original)
+++ trunk/src/lib/common.py	Sat Sep 27 01:29:17 2008
@@ -7,8 +7,7 @@
     from defs import *
 except:
     APPVERSION = "0.3.2"
-
-datadir = "/usr/share"
+    datadir = "/usr/share"
 
 # Application info
 APPNAME = "BillReminder"

Modified: trunk/src/lib/defs.py.in
==============================================================================
--- trunk/src/lib/defs.py.in	(original)
+++ trunk/src/lib/defs.py.in	Sat Sep 27 01:29:17 2008
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 
-APPVERSION = "@VERSION@"
\ No newline at end of file
+APPVERSION = "@VERSION@"
+datadir="@datadir@"