This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
intl patches to 020820 snapshot

From: Albert Chin <binutils at lists dot thewrittenword dot com>
To: binutils at sources dot redhat dot com
Date: Thu, 5 Sep 2002 07:44:18 -0500
Subject: intl patches to 020820 snapshot
Reply-to: binutils at sources dot redhat dot com
Newer versions of gettext place the po files in $(datadir) rather than
$(prefix)/share. Patch below to do the same with the existing intl
code.

2002-09-05  Albert Chin-A-Young <china@thewrittenword.com>
        * binutils/po/Make-in: Change path .po files get installed
	in and referenced in to $(datadir) from $(prefix)/share
	to match newer versions of gettext.
	* binutils/Makefile.am: Ditto
	* bfd/po/Make-in: Ditto
	* gas/po/Make-in: Ditto
	* gas/Makefile.am: Ditto
	* opcodes/po/Make-in: Ditto
	* ld/po/Make-in: Ditto
	* ld/Makefile.am: Ditto
	* gprof/po/Make-in: Ditto
	* gprof/Makefile.am: Ditto
	* intl/Makefile.in: Ditto

-- 
albert chin (china@thewrittenword.com)

-- snip snip
--- binutils/po/Make-in.orig	Fri Aug 23 19:03:10 2002
+++ binutils/po/Make-in	Fri Aug 23 18:47:18 2002
@@ -18,10 +18,10 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
 subdir = po
 
 INSTALL = @INSTALL@
--- binutils/Makefile.am.orig	Fri Aug 23 18:58:39 2002
+++ binutils/Makefile.am	Fri Aug 23 18:58:55 2002
@@ -75,7 +75,7 @@
 	 -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
 	 @HDEFINES@ \
 	 -I$(srcdir)/../intl -I../intl \
-	 -DLOCALEDIR="\"$(prefix)/share/locale\"" \
+	 -DLOCALEDIR="\"$(datadir)/locale\"" \
 	 -Dbin_dummy_emulation=$(EMULATION_VECTOR)
 
 HFILES = \
--- bfd/po/Make-in.orig	Fri Aug 23 18:51:22 2002
+++ bfd/po/Make-in	Fri Aug 23 18:47:53 2002
@@ -18,10 +18,10 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
 subdir = po
 
 INSTALL = @INSTALL@
--- gas/po/Make-in.orig	Fri Aug 23 18:49:09 2002
+++ gas/po/Make-in	Fri Aug 23 18:49:20 2002
@@ -18,10 +18,10 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
 subdir = po
 
 INSTALL = @INSTALL@
--- gas/Makefile.am.orig	Fri Aug 23 18:59:06 2002
+++ gas/Makefile.am	Fri Aug 23 19:00:05 2002
@@ -474,13 +474,13 @@
 # Both . and srcdir are used, in that order,
 # so that tm.h and config.h will be found in the compilation
 # subdirectory rather than in the source directory.
-INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(prefix)/share/locale\""
+INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(datadir)/locale\""
 
 # This should be parallel to INCLUDES, but should replace $(srcdir)
 # with $${srcdir}, and should work in a subdirectory.  This is used
 # when building dependencies, because the dependency building is done
 # in a subdirectory.
-DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl -DLOCALEDIR="\"$(prefix)/share/locale\""
+DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl -DLOCALEDIR="\"$(datadir)/locale\""
 
 DEP_FLAGS = -DBFD_ASSEMBLER -DOBJ_MAYBE_ELF \
 	-I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES)
--- opcodes/po/Make-in.orig	Fri Aug 23 18:53:35 2002
+++ opcodes/po/Make-in	Fri Aug 23 18:53:48 2002
@@ -18,10 +18,10 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
 subdir = po
 
 INSTALL = @INSTALL@
--- ld/po/Make-in.orig	Fri Aug 23 18:54:15 2002
+++ ld/po/Make-in	Fri Aug 23 18:54:28 2002
@@ -18,10 +18,10 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
 subdir = po
 
 INSTALL = @INSTALL@
--- ld/Makefile.am.orig	Fri Aug 23 18:54:45 2002
+++ ld/Makefile.am	Fri Aug 23 18:55:02 2002
@@ -101,7 +101,7 @@
 noinst_TEXINFOS = ldint.texinfo
 man_MANS = ld.1
 
-INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(prefix)/share/locale\""
+INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\""
 
 BFDLIB = ../bfd/libbfd.la
 LIBIBERTY = ../libiberty/libiberty.a
--- gprof/po/Make-in.orig	Fri Aug 23 18:56:58 2002
+++ gprof/po/Make-in	Fri Aug 23 18:57:12 2002
@@ -18,10 +18,10 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
 subdir = po
 
 INSTALL = @INSTALL@
--- gprof/Makefile.am.orig	Fri Aug 23 18:57:18 2002
+++ gprof/Makefile.am	Fri Aug 23 18:57:43 2002
@@ -15,7 +15,7 @@
 
 MKDEP = gcc -MM
 
-INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. -DLOCALEDIR="\"$(prefix)/share/locale\""
+INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. -DLOCALEDIR="\"$(datadir)/locale\""
 
 bin_PROGRAMS = gprof
 
--- intl/Makefile.in.orig	Fri Aug 23 18:57:57 2002
+++ intl/Makefile.in	Fri Aug 23 18:58:21 2002
@@ -30,10 +30,10 @@
 transform = @program_transform_name@
 libdir = $(exec_prefix)/lib
 includedir = $(prefix)/include
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = @datadir@/gettext/intl
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/intl
 aliaspath = $(localedir):.
 subdir = intl
Follow-Ups:
- Re: intl patches to 020820 snapshot
  - From: Nick Clifton
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]