← Back to branch summary

~ubuntu-branches/ubuntu/breezy/libx11/breezy

« back to all changes in this revision

Viewing changes to nls/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Stone
  • Date: 2005-09-30 16:30:55 UTC
  • Revision ID: james.westby@ubuntu.com-20050930163055-dfterq3qv2h111u0
Tags: 1:6.2.1+cvs.20050722-8
Fix non-UTF-8 locales by fixing generation of compose.dir, locale.alias,
and locale.dir in nls/ (closes: Ubuntu#13724).

Show diffs side-by-side

added added

removed removed

Lines of Context:
nls/Makefile.am
1
1
x11localedir = @X11_LOCALEDATADIR@
2
2
 
3
 
EXTRA_DIST = locale.alias.pre compose.dir.pre
 
3
EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre
4
4
 
5
 
dist_x11locale_DATA=locale.dir compose.dir
6
 
x11locale_DATA=locale.alias
 
5
x11locale_DATA = locale.alias locale.dir compose.dir
7
6
 
8
7
DISTCLEANFILES= \
9
 
        locale.alias locale.alias.l1 \
10
 
        compose.dir compose.dir.l1 \
 
8
        locale.alias locale.alias.l1 locale.alias.l2 \
 
9
        compose.dir compose.dir.l1 compose.dir.l2 \
 
10
        locale.dir locale.dir.l1 locale.dir.l2 \
11
11
        XLC_LOCALE
12
12
 
13
13
SUBDIRS= \
73
73
locale.alias: locale.alias.pre
74
74
        $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
75
75
        sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
76
 
        < locale.alias.l1 > locale.alias
 
76
                < locale.alias.l1 > locale.alias.l2
 
77
        cat locale.alias.l2 locale.alias.l1 > locale.alias
77
78
 
78
79
compose.dir: compose.dir.pre
79
80
        $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1
80
81
        sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
81
 
        < compose.dir.l1 > compose.dir
 
82
        < compose.dir.l1 > compose.dir.l2
 
83
        cat compose.dir.l2 compose.dir.l1 > compose.dir
 
84
 
 
85
locale.dir: locale.dir.pre
 
86
        $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1
 
87
        sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
 
88
        < locale.dir.l1 > locale.dir.l2
 
89
        cat locale.dir.l2 locale.dir.l1 > locale.dir