From: Jan Nieuwenhuizen Date: Tue, 16 Feb 1999 21:59:06 +0000 (+0100) Subject: patch::: 1.1.30.jcn1: make fixjes X-Git-Tag: release/1.1.31~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=940de3a1a0f1af50bbef42470db36471d71efc5f;p=lilypond.git patch::: 1.1.30.jcn1: make fixjes pl 30.jcn1 - sm fixes, intl/ fixes --- diff --git a/NEWS b/NEWS index 0db7718f1c..beb6a48c3c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +pl 30.jcn1 + - sm fixes, intl/ fixes + pl 30 (feb 15) pl 29.uu1 diff --git a/VERSION b/VERSION index b14c758bed..3d2c602782 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=30 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index cb1ebe6cc0..4e05d378af 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,9 +1,5 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -242,7 +238,12 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}") AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") - package_depth=`dirname $cache_file` + if test "$package_depth" = "" ; then + package_depth="." + else + package_depth="../$package_depth" + fi + export package_depth AC_SUBST(package_depth) AUTOGENERATE="This file was automatically generated by configure" diff --git a/intl/GNUmakefile b/intl/GNUmakefile index 45496fe22c..472d7bfa88 100644 --- a/intl/GNUmakefile +++ b/intl/GNUmakefile @@ -9,34 +9,37 @@ SED_FILES = $(wildcard *.sed) URG_DEFINES = -DGNULOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(localedir):\" EXTRA_CFLAGS = -I. $(URG_DEFINES) -EXTRA_DIST_FILES = Makefile.in.dist cat-compat.c.dist ChangeLog libintl.inst $(SED_FILES) +EXTRA_DIST_FILES = Makefile.in.dist cat-compat.c.dist ChangeLog $(SED_FILES) -STEPMAKE_TEMPLATES=c library +ifeq ($(strip $(LIBINTL)),) +STEPMAKE_TEMPLATES=c +else +STEPMAKE_TEMPLATES=c library install-library +endif + +# catch default targets: don't make, install etc. +default: $(outdir) + @echo "*** To install libintl type 'make lib; make install-lib' ***" $(outdir)/library.a: @echo "*** To install libintl type 'make lib; make install-lib' ***" +localinstall: $(outdir) + @echo "*** To install libintl type 'make lib; make install-lib' ***" + +localuninstall: $(outdir) + @echo "*** To uninstall libintl type 'make uninstall-lib' ***" + include $(depth)/make/stepmake.make -lib: $(LIBRARY) -LIBINTL = $(LIBRARY) - -# localinstall: $(LIBINTL) -install-lib: $(LIBINTL) - $(INSTALL) -d $(includedir) -# $(INSTALL) libintl.h $(includedir) - $(INSTALL) libintl.inst $(includedir)/libintl.h -ifeq ($(LIB_SUFFIX),.so) - $(INSTALL) -d $(libdir) - $(INSTALL) $(LIBINTL).$(VERSION) $(libdir) - ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION) - ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX) -else - $(INSTALL) -d $(libdir) - $(INSTALL) $(LIBINTL) $(libdir)/$(INSTALL_LIBRARY) -endif -localuninstall: - rm -f $(includedir)/libintl.h - rm -f $(libdir)/libintl.{so*,a} +# deferred targets +lib: + $(MAKE) LIBINTL=yes all + +install-lib: $(LIBRARY) + $(MAKE) LIBINTL=yes localinstall + +uninstall-lib: + $(MAKE) LIBINTL=yes localuninstall diff --git a/intl/libintl.h b/intl/libintl.h new file mode 100644 index 0000000000..4b91230f88 --- /dev/null +++ b/intl/libintl.h @@ -0,0 +1,108 @@ +/* libintl.h -- Message catalogs for internationalization. +Copyright (C) 1995 Free Software Foundation, Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _LIBINTL_H +#define _LIBINTL_H 1 + +#ifdef HAVE_LOCALE_H +# include +#endif + +/* We define an additional symbol to signal that we use the GNU + implementation of gettext. */ +#define __USE_GNU_GETTEXT 1 + +#ifndef __P +# if __STDC__ +# define __P(args) args +# else +# define __P(args) () +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +extern char *gettext __P ((const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current + LC_MESSAGES locale. */ +extern char *dgettext __P ((const char *__domainname, const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +extern char *dcgettext __P ((const char *__domainname, const char *__msgid, + int __category)); + + +/* Set the current default message catalog to DOMAINNAME. + If DOMAINNAME is null, return the current default. + If DOMAINNAME is "", reset to the default of "messages". */ +extern char *textdomain __P ((const char *__domainname)); + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +extern char *bindtextdomain __P ((const char *__domainname, + const char *__dirname)); + + +/* Optimized version of the functions above. */ +#if defined __OPTIMIZED +/* These must be a macro. Inlined functions are useless because the + `__builtin_constant_p' predicate in dcgettext would always return + false. */ + +# define gettext(msgid) dgettext ((char *) 0, msgid) + +# define dgettext(domainname, msgid) \ + dcgettext (domainname, msgid, LC_MESSAGES) + +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define dcgettext(domainname, msgid, category) \ + (__extension__ \ + ({ \ + char *result; \ + if (__builtin_constant_p (msgid)) \ + { \ + extern int _nl_msg_cat_cntr; \ + static char *__translation__; \ + static int __catalog_counter__; \ + if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ + { \ + __translation__ = \ + (dcgettext) ((domainname), (msgid), (category)); \ + __catalog_counter__ = _nl_msg_cat_cntr; \ + } \ + result = __translation__; \ + } \ + else \ + result = (dcgettext) ((domainname), (msgid), (category)); \ + result; \ + })) +# endif +#endif /* Optimizing. */ + + +#ifdef __cplusplus +} +#endif + +#endif /* libintl.h */ diff --git a/intl/libintl.inst b/intl/libintl.inst index 4b91230f88..e69de29bb2 100644 --- a/intl/libintl.inst +++ b/intl/libintl.inst @@ -1,108 +0,0 @@ -/* libintl.h -- Message catalogs for internationalization. -Copyright (C) 1995 Free Software Foundation, Inc. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifndef _LIBINTL_H -#define _LIBINTL_H 1 - -#ifdef HAVE_LOCALE_H -# include -#endif - -/* We define an additional symbol to signal that we use the GNU - implementation of gettext. */ -#define __USE_GNU_GETTEXT 1 - -#ifndef __P -# if __STDC__ -# define __P(args) args -# else -# define __P(args) () -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -extern char *gettext __P ((const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current - LC_MESSAGES locale. */ -extern char *dgettext __P ((const char *__domainname, const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -extern char *dcgettext __P ((const char *__domainname, const char *__msgid, - int __category)); - - -/* Set the current default message catalog to DOMAINNAME. - If DOMAINNAME is null, return the current default. - If DOMAINNAME is "", reset to the default of "messages". */ -extern char *textdomain __P ((const char *__domainname)); - -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -extern char *bindtextdomain __P ((const char *__domainname, - const char *__dirname)); - - -/* Optimized version of the functions above. */ -#if defined __OPTIMIZED -/* These must be a macro. Inlined functions are useless because the - `__builtin_constant_p' predicate in dcgettext would always return - false. */ - -# define gettext(msgid) dgettext ((char *) 0, msgid) - -# define dgettext(domainname, msgid) \ - dcgettext (domainname, msgid, LC_MESSAGES) - -# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define dcgettext(domainname, msgid, category) \ - (__extension__ \ - ({ \ - char *result; \ - if (__builtin_constant_p (msgid)) \ - { \ - extern int _nl_msg_cat_cntr; \ - static char *__translation__; \ - static int __catalog_counter__; \ - if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ - { \ - __translation__ = \ - (dcgettext) ((domainname), (msgid), (category)); \ - __catalog_counter__ = _nl_msg_cat_cntr; \ - } \ - result = __translation__; \ - } \ - else \ - result = (dcgettext) ((domainname), (msgid), (category)); \ - result; \ - })) -# endif -#endif /* Optimizing. */ - - -#ifdef __cplusplus -} -#endif - -#endif /* libintl.h */ diff --git a/stepmake/NEWS b/stepmake/NEWS index c2935e25ab..6fc5bf84a7 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,9 @@ +pl 69 + - package_depth detection fix + +pl 68 + - support for install-libraries + pl 66 - check for tbl and gmake diff --git a/stepmake/VERSION b/stepmake/VERSION index 397e3cf00f..e92135e2ec 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=67 +PATCH_LEVEL=69 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 0e035cad95..08b38e37db 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,7 +1,3 @@ -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -240,7 +236,12 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}") AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") - package_depth=`dirname $cache_file` + if test "$package_depth" = "" ; then + package_depth="." + else + package_depth="../$package_depth" + fi + export package_depth AC_SUBST(package_depth) AUTOGENERATE="This file was automatically generated by configure" diff --git a/stepmake/stepmake/install-library-rules.make b/stepmake/stepmake/install-library-rules.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/install-library-rules.make @@ -0,0 +1 @@ +# empty diff --git a/stepmake/stepmake/install-library-targets.make b/stepmake/stepmake/install-library-targets.make new file mode 100644 index 0000000000..cb3915ea42 --- /dev/null +++ b/stepmake/stepmake/install-library-targets.make @@ -0,0 +1,22 @@ + +localinstall: $(LIBRARY) +ifneq ($(strip $(INSTALL_HEADERS)),) + $(INSTALL) -d $(includedir) + $(INSTALL) $(INSTALL_HEADERS) $(includedir) +endif +ifeq ($(LIB_SUFFIX),.so) + $(INSTALL) -d $(libdir) + $(INSTALL) $(LIBRARY) $(libdir)/$(INSTALL_LIBRARY).$(VERSION) + ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION) + ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX) +else + $(INSTALL) -d $(libdir) + $(INSTALL) $(LIBRARY) $(libdir)/$(INSTALL_LIBRARY) +endif + +localuninstall: +ifneq ($(strip $(INSTALL_HEADERS)),) + rm -f $(addprefix $(includedir)/, $(INSTALL_HEADERS)) +endif + rm -f $(libdir)/$(INSTALL_LIBRARY) + diff --git a/stepmake/stepmake/install-library-vars.make b/stepmake/stepmake/install-library-vars.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/install-library-vars.make @@ -0,0 +1 @@ +# empty