From d9ac38ff1fffc11f244f6550542b6f63050b5ac2 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 10 Jan 2007 02:14:25 +0000 Subject: [PATCH] 2007-01-09 Alex Roitman * src/const.py.in: use proper macros. * src/gramps.py: Correctly define dirs. svn: r7889 --- gramps2/ChangeLog | 4 ++++ gramps2/src/const.py.in | 3 ++- gramps2/src/gramps.py | 5 ++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 2a5081bf7..2d2e3fed5 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2007-01-09 Alex Roitman + * src/const.py.in: use proper macros. + * src/gramps.py: Correctly define dirs. + 2007-01-10 Zsolt Foldvari * src/Selectors/_BaseSelector.py (__init__, _on_row_activated): enable selection by Double-click or Enter diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in index 985193920..0d4d9b13e 100644 --- a/gramps2/src/const.py.in +++ b/gramps2/src/const.py.in @@ -63,7 +63,8 @@ convert = "convert" pixdir = "/usr/share/pixmaps" nautdir = "/usr/share/pixmaps/nautilus" -prefixdir = "@GPREFIX@" +prefixdir = "@prefix@" +sysconfdir = "@sysconfdir@" #------------------------------------------------------------------------- # diff --git a/gramps2/src/gramps.py b/gramps2/src/gramps.py index d6932b5f3..00cbe16e0 100644 --- a/gramps2/src/gramps.py +++ b/gramps2/src/gramps.py @@ -162,9 +162,8 @@ def run(): program.set_property('app-libdir', '%s/lib' % const.prefixdir) program.set_property('app-datadir', - '%s/share/gramps' % const.prefixdir) - program.set_property('app-sysconfdir', - '%s/etc' % const.prefixdir) + '%s/share' % const.prefixdir) + program.set_property('app-sysconfdir',const.sysconfdir) program.set_property('app-prefix', const.prefixdir) except: pass