Scons: fix substFile dependence problems

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 83f459e3e43a9d804c8c9f0751eb722d467dec5a..890becbbe301026dcf6ab9433f6522779ae290ad 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1334,6 +1334,7 @@ else:
 # this looks misplaced, but intl/libintl.h is needed by src/message.C
 if env['nls'] and included_gettext:
     # libgnuintl.h.in => libintl.h
+    env.Depends('$TOP_SRCDIR/intl/libintl.h', '$BUILDDIR/intl/config.h')
     env.substFile('$BUILDDIR/intl/libintl.h', '$TOP_SRCDIR/intl/libgnuintl.h.in')
     env.Command('$BUILDDIR/intl/libgnuintl.h', '$BUILDDIR/intl/libintl.h',
         [Copy('$TARGET', '$SOURCE')])
@@ -1697,6 +1698,7 @@ if build_support:
     #
     print "Processing files in src/support..."
 
+    env.Depends('$BUILDDIR/common/support/package.C', '$BUILDDIR/common/config.h')
     env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRCDIR/src/support/package.C.in')
 
     support = env.StaticLibrary(
@@ -1936,6 +1938,7 @@ if build_lyxbase:
     #
     print "Processing files in src..."
 
+    env.Depends('$BUILDDIR/common/version.C', '$BUILDDIR/common/config.h')
     env.substFile('$BUILDDIR/common/version.C', '$TOP_SRCDIR/src/version.C.in')
 
     if env.has_key('USE_ASPELL') and env['USE_ASPELL']:
@@ -2244,18 +2247,18 @@ if 'install' in targets:
     
     if platform_name == 'cygwin':
         # cygwin packaging requires a file /usr/share/doc/Cygwin/foot-vendor-suffix.README
-        Cygwin_README = os.path.join(dest_prefix_dir, 'doc', 'Cygwin', 
-            '%s%s.README' % (package, package_cygwin_version))
+        Cygwin_README = os.path.join(dest_prefix_dir, 'share', 'doc', 'Cygwin', 
+            '%s-%s.README' % (package, package_cygwin_version))
         env.InstallAs(Cygwin_README,
             os.path.join(env.subst('$TOP_SRCDIR'), 'README.cygwin'))
         Alias('install', Cygwin_README)
         # also a directory /usr/share/doc/lyx for README etc
-        Cygwin_Doc = os.path.join(dest_prefix_dir, 'doc', package)
+        Cygwin_Doc = os.path.join(dest_prefix_dir, 'share', 'doc', package)
         env.Install(Cygwin_Doc, [os.path.join(env.subst('$TOP_SRCDIR'), x) for x in \
             ['INSTALL', 'README', 'README.Cygwin', 'RELEASE-NOTES', 'COPYING', 'ANNOUNCE']])
         Alias('install', Cygwin_Doc)
         # cygwin fonts also need to be installed
-        Cygwin_fonts = os.path.join(share_dest_dir, 'font')
+        Cygwin_fonts = os.path.join(share_dest_dir, 'fonts')
         env.Install(Cygwin_fonts, 
             [env.subst('$TOP_SRCDIR/development/Win32/packaging/bakoma/%s' % file) \
                   for file in win32_bakoma_fonts])
@@ -2266,12 +2269,12 @@ if 'install' in targets:
         env.Install(postinstall_script, tmp_script)
         Alias('install', postinstall_script)
 
-    # lyx1.4.x does not have lyx2lyx_version.py.in
-    if os.path.isfile(env.subst('$TOP_SRCDIR/lib/lyx2lyx/lyx2lyx_version.py.in')):
-        # subst and install this file
-        env.substFile(share_dest_dir + '/lyx2lyx/lyx2lyx_version.py',
-            '$TOP_SRCDIR/lib/lyx2lyx/lyx2lyx_version.py.in')
-        Alias('install', share_dest_dir + '/lyx2lyx/lyx2lyx_version.py')
+    # subst and install lyx2lyx_version.py which is not in scons_manifest.py
+    env.Depends(share_dest_dir + '/lyx2lyx/lyx2lyx_version.py', '$BUILDDIR/common/config.h')
+    env.substFile(share_dest_dir + '/lyx2lyx/lyx2lyx_version.py',
+        '$TOP_SRCDIR/lib/lyx2lyx/lyx2lyx_version.py.in')
+    Alias('install', share_dest_dir + '/lyx2lyx/lyx2lyx_version.py')
+
     # man
     env.InstallAs(os.path.join(man_dest_dir, 'lyx' + version_suffix + '.1'),
         env.subst('$TOP_SRCDIR/lyx.man'))