diff options
author | Mike Ruprecht <mike.ruprecht@collabora.co.uk> | 2010-04-06 05:29:45 -0500 |
---|---|---|
committer | Mike Ruprecht <mike.ruprecht@collabora.co.uk> | 2010-04-06 17:14:33 -0500 |
commit | c4a999ffd01db1c8e948ad633387ec9891879c16 (patch) | |
tree | e476a32d2abd4b823d25f21ddd7a85f01ad796d0 | |
parent | d09e25eff397c59623c2292373777bbf349a222b (diff) | |
download | telepathy-salut-c4a999ffd01db1c8e948ad633387ec9891879c16.tar.gz |
Fix building with the tr_TR.UTF-8 locale.
The tr_TR.UTF-8 has a quirk regarding upper and lowercase letters.
Using the tr command to replace lowercase letters with uppercase
letters sometimes causes the lowercase letters to remain (namely
'i'). This patch forces a 'C' locale for these tr commands.
-rw-r--r-- | lib/gibber/Makefile.am | 6 | ||||
-rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am index 6871f296..e45ff6f2 100644 --- a/lib/gibber/Makefile.am +++ b/lib/gibber/Makefile.am @@ -149,10 +149,10 @@ endif # rules for making the glib enum objects %-enumtypes.h: %.h Makefile.in $(QUIET_GEN)glib-mkenums \ - --fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fhead "#ifndef __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \ + --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \ $< > $@ %-enumtypes.c: %.h Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am index 8302180e..b5953150 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -197,10 +197,10 @@ salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BAC # rules for making the glib enum objects %-enumtypes.h: %.h Makefile.in $(QUIET_GEN)glib-mkenums \ - --fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fhead "#ifndef __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \ + --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \ $< > $@ %-enumtypes.c: %.h Makefile.in |