* Fixed some scons building errors:

- wave-files are now installed into $pkgdatadir instead of
    $pkgdatadir/waves.
  - Some pkgpython_* variables have not been set for non-building
    targets (eg. clean). This caused building errors. Fixed.
  - HAVE_CONFIG_H was not set for compiler calls.
  - no longer install $sysconfdir/cron.daily/capisuite,
    $sysconfdir/init.d/capisuite and $pkgsysconfdir/cronjob.conf.
* .spec-files have moved, fixed pathes within SCons* files.



git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@395 4ebea2bb-67d4-0310-8558-a5799e421b66
This commit is contained in:
htgoebel 2005-01-07 13:58:09 +00:00
parent 8941eaf68a
commit 6c251f568d
4 changed files with 23 additions and 9 deletions

View File

@ -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

View File

@ -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'),
])

View File

@ -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
"""))

View File

@ -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)