[hamster-applet] respect sysconfdir flag. fixes bug 620965

[Toms Baugis <tbaugis src gnome org>]

commit 01bfed6b693a86ccbc1ec39f568495a11783e1b1
Author: Toms Bauģis <toms baugis gmail com>
Date:   Tue Jun 8 14:47:57 2010 +0100

    respect sysconfdir flag. fixes bug 620965

 data/wscript_build |   40 ++++++++++++++++++++--------------------
 wscript            |   19 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 21 deletions(-)
---
diff --git a/data/wscript_build b/data/wscript_build
index 66e382d..01c8f3c 100644
--- a/data/wscript_build
+++ b/data/wscript_build
@@ -15,34 +15,34 @@ bld.install_files('${DATADIR}/icons/hicolor/scalable/apps','art/scalable/hamster
 
 
 bld(features = "subst",
-				 source= "hamster-standalone.desktop.in.in",
-				 target= "hamster-standalone.desktop.in",
-				 dict = bld.env
-				)
+    source= "hamster-standalone.desktop.in.in",
+    target= "hamster-standalone.desktop.in",
+    dict = bld.env
+   )
 
 bld(features = "subst",
-				 source= "Hamster_Applet.server.in.in",
-				 target= "Hamster_Applet.server.in",
-				 dict = bld.env
-				)
+    source= "Hamster_Applet.server.in.in",
+    target= "Hamster_Applet.server.in",
+    dict = bld.env
+   )
 
 bld.add_group()
 
 # process .in files with intl_tool
 bld(features = 'intltool_in',
-	source   = 'hamster-applet.schemas.in',
-	install_path = '${PREFIX}/etc/gconf/schemas',
-	podir    = '../po',
-	flags    = ['-s', '-u', '-c'])
+    source   = 'hamster-applet.schemas.in',
+    install_path = '${SYSCONFDIR}/gconf/schemas',
+    podir    = '../po',
+    flags    = ['-s', '-u', '-c'])
 
 bld(features = 'intltool_in',
-	source   = 'hamster-standalone.desktop.in',
-	install_path = '${DATADIR}/applications',
-	podir    = '../po',
-	flags    = ['-d', '-q', '-u', '-c'])
+    source   = 'hamster-standalone.desktop.in',
+    install_path = '${DATADIR}/applications',
+    podir    = '../po',
+    flags    = ['-d', '-q', '-u', '-c'])
 
 bld(features = 'intltool_in',
-	source   = 'Hamster_Applet.server.in',
-	install_path = '${LIBDIR}/bonobo/servers',
-	podir    = '../po',
-	flags    = ['-o', '-u', '-c'])
+    source   = 'Hamster_Applet.server.in',
+    install_path = '${LIBDIR}/bonobo/servers',
+    podir    = '../po',
+    flags    = ['-o', '-u', '-c'])
diff --git a/wscript b/wscript
index da16265..71797cb 100644
--- a/wscript
+++ b/wscript
@@ -22,11 +22,26 @@ def configure(conf):
     conf.define('GETTEXT_PACKAGE', "hamster-applet")
     conf.define('PACKAGE', "hamster-applet")
     conf.define('PYEXECDIR', conf.env["PYTHONDIR"]) # i don't know the difference
-    conf.define('prefix', conf.env["PREFIX"]) # to keep compatibility for now
 
+    # avoid case when we want to install globally (prefix=/usr) but sysconfdir
+    # was not specified
+    if conf.env['SYSCONFDIR'] == '/usr/etc':
+        conf.define('SYSCONFDIR', '/etc')
+    else:
+        conf.define('SYSCONFDIR', conf.env['SYSCONFDIR'])
+
+    conf.define('prefix', conf.env["PREFIX"]) # to keep compatibility for now
 
     conf.sub_config("help")
 
+
+def set_options(opt):
+    # options for disabling pyc or pyo compilation
+    opt.tool_options("python")
+    opt.tool_options("misc")
+    opt.tool_options("gnu_dirs")
+
+
 def build(bld):
     bld.install_files('${LIBDIR}/hamster-applet', 'src/hamster-applet', chmod = 0755)
     bld.install_files('${BINDIR}',
@@ -71,6 +86,7 @@ def copy_help(ctx):
     import os
     os.system('cp -R build/default/help/ .')
 
+
 def push_release(ctx):
     """copies generated page files to sources so that they are packaged on dist
        then creates the tarball and pushes to git master
@@ -83,6 +99,7 @@ def push_release(ctx):
     os.system('scp %s tbaugis master gnome org:/home/users/tbaugis' % tarball)
     os.system("ssh tbaugis master gnome org 'install-module %s'" % tarball)
 
+
 def release(ctx):
     """packaging a version"""
     import Scripting