diff --git a/ChangeLog b/ChangeLog
index 2c11964..54bf87e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-01-07  Hartmut Goebel  <h.goebel@crazy-compilers.com>
+	* scripts/waves/SConscript: wave-files are now installed into
+	  $pkgdatadir instead of $pkgdatadir/waves.
+	* SConstruct: Some pkgpython_* variables have not been set for
+	  non-building targets (eg. clean). This caused building errors.
+	  Fixed.
+	* SConstruct: define HAVE_CONFIG_H for compiler calls.
+	* SConstruct: .spec-files have moved, fixed pathes.
+	* SConscript: no longer install $sysconfdir/cron.daily/capisuite,
+	  $sysconfdir/init.d/capisuite and $pkgsysconfdir/cronjob.conf.
+
 2005-01-07  Gernot Hillier  <gernot@hillier.de>
 	* src/capisuite-py/Makefile.am: fix installation paths for capisuite-py
 	  files, fixes bug #108
diff --git a/SConscript b/SConscript
index 7221cc3..15c3a74 100644
--- a/SConscript
+++ b/SConscript
@@ -11,7 +11,7 @@ env.AddPostAction([cronfile, rcfile], Chmod('$TARGETS', 0755))
 
 env.Alias('install', [
     env.Install('$docdir', Split('COPYING NEWS README AUTHORS')),
-    env.InstallAs('$sysconfdir/init.d/capisuite', rcfile),
-    env.InstallAs('$sysconfdir/cron.daily/capisuite', cronfile),
-    env.InstallAs('$pkgsysconfdir/cronjob.conf','cronjob.conf'),
+    #env.InstallAs('$sysconfdir/init.d/capisuite', rcfile),
+    #env.InstallAs('$sysconfdir/cron.daily/capisuite', cronfile),
+    #env.InstallAs('$pkgsysconfdir/cronjob.conf','cronjob.conf'),
     ])
diff --git a/SConstruct b/SConstruct
index 0c9c9e5..a775a03 100644
--- a/SConstruct
+++ b/SConstruct
@@ -305,11 +305,13 @@ if not GetOption('clean') and not is_dist:
            or 'configure' in COMMAND_LINE_TARGETS:
         env.SConscript('SConscript-Config', build_dir=build_dir)
 
-    # get some build variables we always need to evaluate
-    GetPythonModuleSetup(env)
     GetPythonEmbeddedSetup(env)
     Get_sfftobmp_Version(env)
 
+# get some build variables we always need to evaluate,
+# even for non-building targets.
+GetPythonModuleSetup(env)
+
 ###---####---###---####---###---####---###---####---###---####---###---###
 
 env.Append(
@@ -321,6 +323,7 @@ env.Append(
                 'PKGDATADIR'   : r'\"${pkgdatadir}\"',
                 'PKGSYSCONFDIR': r'\"${pkgsysconfdir}\"',
                 'PKGLIBDIR'    : r'\"${pkglibdir}\"',
+                'HAVE_CONFIG_H': 1, # we always have config.h
                 },
     )
 
@@ -342,7 +345,7 @@ env.SConscript(dirs=[Dir('.', build_dir),
                      Dir('scripts', build_dir),
                      Dir('scripts/waves', build_dir),
                      Dir('docs', build_dir),
-                     Dir('suse'),
+                     Dir('packages/rpm'),
                      ])
 
 #--- additional files to be distributed ---
@@ -359,7 +362,7 @@ env.ExtraDist(Split("""
     src/SConscript
     scripts/SConscript
     scripts/waves/SConscript
-    suse/SConscript
+    packages/rpm/SConscript
     docs/SConscript
     """))
 
diff --git a/scripts/waves/SConscript b/scripts/waves/SConscript
index 309544c..6ba4e9d 100644
--- a/scripts/waves/SConscript
+++ b/scripts/waves/SConscript
@@ -10,6 +10,6 @@ def findFiles(pattern, subdir=''):
             files.append(File(os.path.join(subdir, file), Dir('.')))
     return files
 
-for n in (env.Install('$pkgdatadir/waves', 'README' ),
-          env.Install('$pkgdatadir/waves', findFiles('*.la'))):
+for n in (env.Install('$pkgdatadir', 'README' ),
+          env.Install('$pkgdatadir', findFiles('*.la'))):
     env.Alias('install', n)