Add dummy xgettext markers.

diff --git a/ChangeLog b/ChangeLog
index e5540203ff65e9eba17e03e0c7c826b4f32b6fde..d4e847cb983679dfb0d8a0580281c8808b4eea47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-07  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/main.cc: Add dummy xgettext markers.
+
 2005-03-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * make/lilypond.fedora.spec.in (Requires): scrap kpathsea/tex

diff --git a/SConstruct b/SConstruct
index 17bf53b98570ea6acd224a0ef077d017a434f586..5ec6fd75c3d093d85d88daec9dfcf0e8e936425a 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -330,7 +330,8 @@ def configure (target, source, env):
        else:
                env.Append (CPPPATH = PYTHON_INCLUDE)
 
-       headers = ('sys/stat.h', 'assert.h', 'kpathsea/kpathsea.h', 'Python.h')
+       headers = ('sys/stat.h', 'assert.h', 'kpathsea/kpathsea.h', 'libio.h',
+                  'Python.h')
        for i in headers:
                if conf.CheckCHeader (i):
                        key = re.sub ('[./]', '_', 'HAVE_' + string.upper (i))
@@ -342,7 +343,8 @@ def configure (target, source, env):
                        key = re.sub ('[./]', '_', 'HAVE_' + string.upper (i))
                        conf.env['DEFINES'][key] = 1
 
-       functions = ('gettext', 'isinf', 'memmem', 'snprintf', 'vsnprintf')
+       functions = ('fopencookie', 'funopen',
+                    'gettext', 'isinf', 'memmem', 'snprintf', 'vsnprintf')
        for i in functions:
                if 0 or conf.CheckFunc (i):
                        key = re.sub ('[./]', '_', 'HAVE_' + string.upper (i))
@@ -659,7 +661,8 @@ def symlink_tree (target, source, env):
                os.symlink (frm, os.path.basename (dst))
        shutil.rmtree (run_prefix)
        prefix = os.path.join (env['out'], 'usr')
-       map (lambda x: symlink (x[0], os.path.join (prefix, x[1])),
+       map (lambda x: symlink (x[0], os.path.join (prefix,
+                                                   x[1] % {'ver' : version})),
             # ^# := source dir
             # @  := out
             # /$ := add dst file_name
@@ -667,25 +670,25 @@ def symlink_tree (target, source, env):
              ('lily/',      'bin/lilypond-bin'),
              ('scripts/',   'bin/lilypond'),
              ('scripts/',   'bin/lilypond-book'),
-             ('mf',         'share/lilypond/dvips/mf-out'),
-             ('#ps',        'share/lilypond/dvips/ps'),
-             ('#ps',        'share/lilypond/tex/music-drawing-routines.ps'),
-             ('mf',         'share/lilypond/otf'),
-             ('mf',         'share/lilypond/tfm'),
-             ('tex',        'share/lilypond/tex/enc'),
-             ('#mf',        'share/lilypond/fonts/mf'),
-             ('mf',         'share/lilypond/fonts/map'),
-             ('mf',         'share/lilypond/fonts/otf'),
-             ('mf',         'share/lilypond/fonts/tfm'),
-             ('mf',         'share/lilypond/fonts/type1'),
-             ('#tex',       'share/lilypond/tex/source'),
-             ('tex',        'share/lilypond/tex/tex-out'),
-             ('mf',         'share/lilypond/tex/mf-out'),
-             ('#ly',        'share/lilypond/ly'),
-             ('#scm',       'share/lilypond/scm'),
-             ('#ps',        'share/lilypond/ps'),
+             ('mf',         'share/lilypond/%(ver)s/dvips/mf-out'),
+             ('#ps',        'share/lilypond/%(ver)s/dvips/ps'),
+             ('#ps',        'share/lilypond/%(ver)s/tex/music-drawing-routines.ps'),
+             ('mf',         'share/lilypond/%(ver)s/otf'),
+             ('mf',         'share/lilypond/%(ver)s/tfm'),
+             ('tex',        'share/lilypond/%(ver)s/tex/enc'),
+             ('#mf',        'share/lilypond/%(ver)s/fonts/mf'),
+             ('mf',         'share/lilypond/%(ver)s/fonts/map'),
+             ('mf',         'share/lilypond/%(ver)s/fonts/otf'),
+             ('mf',         'share/lilypond/%(ver)s/fonts/tfm'),
+             ('mf',         'share/lilypond/%(ver)s/fonts/type1'),
+             ('#tex',       'share/lilypond/%(ver)s/tex/source'),
+             ('tex',        'share/lilypond/%(ver)s/tex/tex-out'),
+             ('mf',         'share/lilypond/%(ver)s/tex/mf-out'),
+             ('#ly',        'share/lilypond/%(ver)s/ly'),
+             ('#scm',       'share/lilypond/%(ver)s/scm'),
+             ('#ps',        'share/lilypond/%(ver)s/ps'),
              ('po/@/nl.mo', 'share/locale/nl/LC_MESSAGES/lilypond.mo'),
-             ('elisp',      'share/lilypond/elisp')))
+             ('elisp',      'share/lilypond/%(ver)s/elisp')))
        os.chdir (srcdir)
 
 if env['debugging']:

diff --git a/lily/main.cc b/lily/main.cc
index 899c9bf2414e07916a70394aa90e47dfa073ba32..1f4a1a5e3016de284ba53e609a3c1c3be311c9f6 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -91,26 +91,25 @@ static char const *PROGRAM_NAME = "lilypond";
 static char const *PROGRAM_URL = "http://lilypond.org";
 
 static char const *NOTICE =
-"This program is free software.  It is covered by the GNU General Public\n"
-"License and you are welcome to change it and/or distribute copies of it\n"
-"under certain conditions.  Invoke as `%s --warranty' for more\n"
-"information.\n";
+_i("This program is free software.  It is covered by the GNU General Public\n"
+   "License and you are welcome to change it and/or distribute copies of it\n"
+   "under certain conditions.  Invoke as `%s --warranty' for more\n"
+   "information.\n");
   
 static char const *WARRANTY =
-"    This program is free software; you can redistribute it and/or\n"
-"modify it under the terms of the GNU General Public License version 2\n"
-"as published by the Free Software Foundation.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
-"General Public License for more details.\n"
-"\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
-"GNU General Public License along with this program; if not, write to\n"
-"the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
-"Boston, MA 02111-1307, USA.\n";
-
+_i("    This program is free software; you can redistribute it and/or\n"
+   "modify it under the terms of the GNU General Public License version 2\n"
+   "as published by the Free Software Foundation.\n"
+   "\n"
+   "    This program is distributed in the hope that it will be useful,\n"
+   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
+   "General Public License for more details.\n"
+   "\n"
+   "    You should have received a copy (refer to the file COPYING) of the\n"
+   "GNU General Public License along with this program; if not, write to\n"
+   "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
+   "Boston, MA 02111-1307, USA.\n");
 
 /* Where the init files live.  Typically:
    LILYPOND_DATADIR = /usr/share/lilypond