diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-30 08:32:35 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-30 08:32:35 +0000 |
| commit | 33b28557ec4ab75f364ef77bdc5f09113e8dade8 (patch) | |
| tree | 907d116337ac34dfe743f6a5b59821604d7d0830 /devel/gettext/files/patch-intl::Makefile.in | |
| parent | Don't install own copy of charset.alias - use one from libiconv instead. Bump (diff) | |
Don't modify charset.alias file installed by libintl.
Diffstat (limited to 'devel/gettext/files/patch-intl::Makefile.in')
| -rw-r--r-- | devel/gettext/files/patch-intl::Makefile.in | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/devel/gettext/files/patch-intl::Makefile.in b/devel/gettext/files/patch-intl::Makefile.in index 9f84c7ece670..d303723cb429 100644 --- a/devel/gettext/files/patch-intl::Makefile.in +++ b/devel/gettext/files/patch-intl::Makefile.in @@ -2,7 +2,7 @@ $FreeBSD$ --- intl/Makefile.in.orig Thu Jan 31 16:11:48 2002 -+++ intl/Makefile.in Tue Apr 30 00:00:15 2002 ++++ intl/Makefile.in Tue Apr 30 11:18:46 2002 @@ -52,7 +52,7 @@ YFLAGS = --name-prefix=__gettext @@ -21,7 +21,7 @@ $FreeBSD$ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) \ -no-undefined -@@ -153,11 +153,11 @@ +@@ -153,22 +153,6 @@ : ; \ fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ @@ -30,15 +30,21 @@ $FreeBSD$ - dest=$(DESTDIR)$(libdir)/charset.alias; \ - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - orig=$(DESTDIR)$(libdir)/charset.alias; \ -+ test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata; \ -+ temp=$(DESTDIR)$(prefix)/libdata/t-charset.alias; \ -+ dest=$(DESTDIR)$(prefix)/libdata/charset.alias; \ -+ if test -f $(DESTDIR)$(prefix)/libdata/charset.alias; then \ -+ orig=$(DESTDIR)$(prefix)/libdata/charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ -@@ -240,9 +240,9 @@ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ +- if test @GLIBC21@ = no; then \ +- orig=charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- fi; \ +- fi; \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + test -f $(DESTDIR)$(localedir)/locale.alias \ + && orig=$(DESTDIR)$(localedir)/locale.alias \ +@@ -240,9 +224,9 @@ : ; \ fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ |