SCons: revert r26134 and fix SCons correctly

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26136 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 5fb6852462144429937f8c3e8b6c3869cf15dda5..5f2a04140c4cb1b28da9f31227037549b2fa674e 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -2047,6 +2047,8 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
         env.Install(postinstall_path, tmp_script)
         Alias('install', postinstall_path)
     # man
+    env.InstallAs(os.path.join(man_dest_dir, 'lyx' + version_suffix + '.1'),
+        env.subst('$TOP_SRCDIR/lyx.1in'))
     env.InstallAs(os.path.join(man_dest_dir, 'tex2lyx' + version_suffix + '.1'),
         env.subst('$TOP_SRCDIR/src/tex2lyx/tex2lyx.man'))
     env.InstallAs(os.path.join(man_dest_dir, 'lyxclient' + version_suffix + '.1'),

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index c6708ddfe73c60f3381914683edff65cb954a476..6b337ebaad504363a45a75a5397300108fc333b4 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -21,6 +21,7 @@ TOP_extra_files = Split('''
     autogen.sh
     config.log
     configure.ac
+    lyx.1in
     rename.sh
     scons_lyx.log
 ''')