Lines 1-103
Link Here
|
1 |
--- intl/Makefile.in.orig Tue May 3 16:14:12 2005 |
|
|
2 |
+++ intl/Makefile.in Tue May 3 16:22:23 2005 |
3 |
@@ -123,7 +123,7 @@ |
4 |
osdep.$lo \ |
5 |
intl-compat.$lo |
6 |
DISTFILES.common = Makefile.in \ |
7 |
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) |
8 |
+ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) |
9 |
DISTFILES.generated = plural.c |
10 |
DISTFILES.normal = VERSION |
11 |
DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \ |
12 |
@@ -132,7 +132,7 @@ |
13 |
COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h |
14 |
|
15 |
all: all-@USE_INCLUDED_LIBINTL@ |
16 |
-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed |
17 |
+all-yes: libintl.$la libintl.h ref-add.sed ref-del.sed |
18 |
all-no: all-no-@BUILD_INCLUDED_LIBINTL@ |
19 |
all-no-yes: libgnuintl.$la |
20 |
all-no-no: |
21 |
@@ -229,10 +229,6 @@ |
22 |
libintl.h: libgnuintl.h |
23 |
cp libgnuintl.h libintl.h |
24 |
|
25 |
-charset.alias: $(srcdir)/config.charset |
26 |
- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ |
27 |
- mv t-$@ $@ |
28 |
- |
29 |
check: all |
30 |
|
31 |
# We must not install the libintl.h/libintl.a files if we are on a |
32 |
@@ -271,30 +267,6 @@ |
33 |
fi |
34 |
if test '@USE_INCLUDED_LIBINTL@' = yes; then \ |
35 |
test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ |
36 |
- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ |
37 |
- dest=$(DESTDIR)$(libdir)/charset.alias; \ |
38 |
- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ |
39 |
- orig=$(DESTDIR)$(libdir)/charset.alias; \ |
40 |
- sed -f ref-add.sed $$orig > $$temp; \ |
41 |
- $(INSTALL_DATA) $$temp $$dest; \ |
42 |
- rm -f $$temp; \ |
43 |
- else \ |
44 |
- if test @GLIBC21@ = no; then \ |
45 |
- orig=charset.alias; \ |
46 |
- sed -f ref-add.sed $$orig > $$temp; \ |
47 |
- $(INSTALL_DATA) $$temp $$dest; \ |
48 |
- rm -f $$temp; \ |
49 |
- fi; \ |
50 |
- fi; \ |
51 |
- $(mkinstalldirs) $(DESTDIR)$(localedir); \ |
52 |
- test -f $(DESTDIR)$(localedir)/locale.alias \ |
53 |
- && orig=$(DESTDIR)$(localedir)/locale.alias \ |
54 |
- || orig=$(srcdir)/locale.alias; \ |
55 |
- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ |
56 |
- dest=$(DESTDIR)$(localedir)/locale.alias; \ |
57 |
- sed -f ref-add.sed $$orig > $$temp; \ |
58 |
- $(INSTALL_DATA) $$temp $$dest; \ |
59 |
- rm -f $$temp; \ |
60 |
else \ |
61 |
: ; \ |
62 |
fi |
63 |
@@ -308,7 +280,6 @@ |
64 |
$(INSTALL_DATA) $(srcdir)/$$file \ |
65 |
$(DESTDIR)$(gettextsrcdir)/$$file; \ |
66 |
done; \ |
67 |
- chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ |
68 |
dists="$(DISTFILES.generated)"; \ |
69 |
for file in $$dists; do \ |
70 |
if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ |
71 |
@@ -365,32 +336,6 @@ |
72 |
if test "$(PACKAGE)" = "gettext-tools" \ |
73 |
&& test '@USE_INCLUDED_LIBINTL@' = no; then \ |
74 |
rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ |
75 |
- else \ |
76 |
- : ; \ |
77 |
- fi |
78 |
- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ |
79 |
- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ |
80 |
- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ |
81 |
- dest=$(DESTDIR)$(libdir)/charset.alias; \ |
82 |
- sed -f ref-del.sed $$dest > $$temp; \ |
83 |
- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ |
84 |
- rm -f $$dest; \ |
85 |
- else \ |
86 |
- $(INSTALL_DATA) $$temp $$dest; \ |
87 |
- fi; \ |
88 |
- rm -f $$temp; \ |
89 |
- fi; \ |
90 |
- if test -f $(DESTDIR)$(localedir)/locale.alias; then \ |
91 |
- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ |
92 |
- dest=$(DESTDIR)$(localedir)/locale.alias; \ |
93 |
- sed -f ref-del.sed $$dest > $$temp; \ |
94 |
- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ |
95 |
- rm -f $$dest; \ |
96 |
- else \ |
97 |
- $(INSTALL_DATA) $$temp $$dest; \ |
98 |
- fi; \ |
99 |
- rm -f $$temp; \ |
100 |
- fi; \ |
101 |
else \ |
102 |
: ; \ |
103 |
fi |