From: Bruno Haible <bruno@clisp.org>
Date: Fri, 14 Feb 2003 21:33:24 +0000 (+0000)
Subject: Adapt to changed directory structure.
X-Git-Tag: v0.12~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f619eafe78b97706708d83208807905032054e0;p=thirdparty%2Fgettext.git

Adapt to changed directory structure.
---

diff --git a/gettext-tools/projects/ChangeLog b/gettext-tools/projects/ChangeLog
index 77d8e2938..d3949a684 100644
--- a/gettext-tools/projects/ChangeLog
+++ b/gettext-tools/projects/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-12  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (pkgdatadir): Define using 'gettext' instead of
+	@PACKAGE@.
+
 2002-08-06  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.11.5 released.
diff --git a/gettext-tools/projects/Makefile.am b/gettext-tools/projects/Makefile.am
index 93b6c729a..112880ce7 100644
--- a/gettext-tools/projects/Makefile.am
+++ b/gettext-tools/projects/Makefile.am
@@ -1,5 +1,5 @@
-## Makefile for the projects subdirectory of the GNU NLS Utilities
-## Copyright (C) 2001-2002 Free Software Foundation, Inc.
+## Makefile for the gettext-tools/projects subdirectory of GNU gettext
+## Copyright (C) 2001-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 
 RM = rm -f
 
+pkgdatadir = $(datadir)/gettext
 projectsdir = $(pkgdatadir)/projects
 
 PROJECTS = TP KDE GNOME
diff --git a/gettext-tools/src/FILES b/gettext-tools/src/FILES
new file mode 100644
index 000000000..5e1d61ac9
--- /dev/null
+++ b/gettext-tools/src/FILES
@@ -0,0 +1,243 @@
+                Short description of the source files
+                =====================================
+
+The msg* and xgettext programs.
+
+Bottom-up structure:
+
+str-list.h
+str-list.c
+                A list-of-immutable-strings type.
+
+dir-list.h
+dir-list.c
+                Management of the list of directories where PO files are
+                searched.
+
+file-list.h
+file-list.c
+                Reading a file list from a file. Used by those programs which
+                accept multiple file arguments and have a --files-from option.
+
+pos.h
+                Source file positions.
+
+message.h
+message.c
+                The message type, with many utility routines.
+                A list-of-messages type.
+                A list-of-lists-of-messages type.
+
+msgl-ascii.h
+msgl-ascii.c
+                Message list test for ASCII character set.
+
+write-po.h
+write-po.c
+                Output of a list-of-messages to a PO file.
+
++-------------- Reading PO files
+| open-po.h
+| open-po.c
+|               Opening PO files for reading.
+|
+| po-charset.h
+| po-charset.c
+|               Charset handling while reading PO files.
+|
+| po-lex.h
+| po-lex.c
+|               Lexical analysis of PO files.
+|
+| po.h
+| po-hash.h
+| po-hash-gen.y
+| po-gram.h
+| po-gram-gen.y
+| po.c
+|               Parsing of PO files.
+|         po.h
+|                       General parser structure.
+|         po-hash.h
+|         po-hash-gen.y
+|                       Lexical analysis and parsing of pseudo-comments in
+|                       PO files, introduced by "#:" and "#".
+|         po-gram.h
+|         po-gram-gen.y
+|                       Parsing of PO files, based on po-lex.{h,c}.
+|         po.c
+|                       Top-level parser functions and callbacks.
+|
+| read-po.h
+| read-po.c
+|               Reading of a PO file, returning a list-of-messages.
+|
++-------------- Reading PO files
+
+msgl-iconv.h
+msgl-iconv.c
+                Convert a list-of-messages to another character encoding.
+
+msgl-cat.h
+msgl-cat.c
+                Concatenate message lists from several files, with handling
+                of duplicate msgids.
+
+msgcmp.c        Main source for the 'msgcmp' program.
+
++-------------- The 'msgmerge' program
+| msgl-equal.h
+| msgl-equal.c
+|               Comparing two lists-of-messages.
+| msgmerge.c
+|               Main source for the 'msgmerge' program.
+|
++-------------- The 'msgmerge' program
+
+msgcomm.c       Main source for the 'msgcomm' program.
+msgattrib.c     Main source for the 'msgattrib' program.
+msgcat.c        Main source for the 'msgcat' program.
+msgconv.c       Main source for the 'msgconv' program.
+msguniq.c       Main source for the 'msguniq' program.
+
+msgl-charset.h
+msgl-charset.c
+                Compare the encoding of a list-of-messages with the locale
+                encoding.
+
+msgexec.c       Main source for the 'msgexec' program.
+msgfilter.c     Main source for the 'msgfilter' program.
+msggrep.c       Main source for the 'msggrep' program.
+
++-------------- The 'msgen' program
+| msgl-english.h
+| msgl-english.c
+|               English message initialization.
+| msgen.c
+|               Main source for the 'msgen' program.
+|
++-------------- The 'msgen' program
+
+po-time.h
+po-time.c
+                Create time stamps for use in PO/POT files.
+
+plural-table.h
+plural-table.c
+                Table of plural form formulas.
+
++-------------- The 'msginit' program
+| hostname.c
+|               The 'hostname' program.
+| user-email.in
+|               Determine the user's email address.
+| urlget.c
+|               The 'urlget' program.
+| project-id
+|               Determine the package's name.
+| msginit.c
+|               Main source for the 'msginit' program.
+|
++-------------- The 'msginit' program
+
++-------------- The 'msgunfmt' program
+| msgunfmt.h
+|               Declarations.
+| read-mo.h
+| read-mo.c
+|               Reading GNU .mo files.
+| read-java.h
+| read-java.c
+|               Reading Java ResourceBundle files.
+| read-tcl.h
+| read-tcl.c
+|               Reading Tcl .msg files.
+| msgunfmt.c
+|               Main source for the 'msgunfmt' program.
+|
++-------------- The 'msgunfmt' program
+
+format.h        Declarations of the language dependent format string handlers.
+format-c.c      Format string handling for C.
+format-python.c Format string handling for Python.
+format-lisp.c   Format string handling for Common Lisp.
+format-elisp.c  Format string handling for Emacs Lisp.
+format-librep.c Format string handling for librep.
+format-java.c   Format string handling for Java.
+format-awk.c    Format string handling for awk.
+format-pascal.c Format string handling for Object Pascal.
+format-ycp.c    Format string handling for YCP.
+format-tcl.c    Format string handling for Tcl.
+format-php.c    Format string handling for PHP.
+format.c        Table of the language dependent format string handlers.
+
++-------------- The 'msgfmt' program
+| msgfmt.h
+|               Declarations.
+| plural.c
+|               Parsing plural expressions.
+| plural-eval.c
+|               Evaluating plursl expressions.
+| write-mo.h
+| write-mo.c
+|               Generating GNU .mo files.
+| write-java.h
+| write-java.c
+|               Generating Java ResourceBundle files.
+| write-tcl.h
+| write-tcl.c
+|               Generating Tcl .msg files.
+| msgfmt.c
+|               Main source for the 'msgfmt' program.
+|
++-------------- The 'msgfmt' program
+
++-------------- The 'xgettext' program
+| xgettext.h
+|               Declarations used by the backends.
+| x-c.h
+| x-c.c
+|               String extractor for C.
+| x-po.h
+| x-po.c
+|               String extractor from PO files.
+| x-python.h
+| x-python.c
+|               String extractor for Python.
+| x-lisp.h
+| x-lisp.c
+|               String extractor for Common Lisp.
+| x-elisp.h
+| x-elisp.c
+|               String extractor for Emacs Lisp.
+| x-librep.h
+| x-librep.c
+|               String extractor for librep.
+| x-smalltalk.h
+| x-smalltalk.c
+|               String extractor for Smalltalk.
+| x-java.h
+| x-java.l
+|               String extractor for Java.
+| x-awk.h
+| x-awk.c
+|               String extractor for awk.
+| x-ycp.h
+| x-ycp.c
+|               String extractor for YCP.
+| x-tcl.h
+| x-tcl.c
+|               String extractor for Tcl.
+| x-php.h
+| x-php.c
+|               String extractor for PHP.
+| x-rst.h
+| x-rst.c
+|               String extractor from .rst files, for Object Pascal.
+| x-glade.h
+| x-glade.c
+|               String extractor from .glade files, GNOME GUI descriptions.
+| xgettext.c
+|               Main source for the 'xgettext' program.
+|
++-------------- The 'xgettext' program
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 9652fa0a4..412f95371 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile for program src directory in GNU NLS utilities package.
+## Makefile for the gettext-tools/src subdirectory of GNU gettext
 ## Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@ DISTCLEANFILES =
 
 RM = rm -f
 
-bin_PROGRAMS = gettext ngettext \
+bin_PROGRAMS = \
 msgcmp msgfmt msgmerge msgunfmt xgettext \
 msgattrib msgcat msgcomm msgconv msgen msgexec msgfilter msggrep msginit msguniq
 
@@ -43,18 +43,28 @@ plural-table.h format.h xgettext.h x-c.h x-po.h x-python.h x-lisp.h \
 x-elisp.h x-librep.h x-smalltalk.h x-java.h x-awk.h x-ycp.h x-tcl.h x-php.h \
 x-rst.h x-glade.h
 
-EXTRA_DIST += FILES project-id
+EXTRA_DIST += FILES project-id ChangeLog.0
 
 localedir = $(datadir)/locale
 jardir = $(datadir)/gettext
+pkgdatadir = $(datadir)/gettext
 projectsdir = $(pkgdatadir)/projects
-
-INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libuniname \
--I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DUSEJEXE=$(USEJEXE) \
--DGETTEXTJEXEDIR=\"$(pkglibdir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
--DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
--DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
+pkglibdir = $(libdir)/gettext
+
+INCLUDES = \
+  -I. -I$(srcdir) \
+  -I.. \
+  -I$(top_srcdir)/libuniname \
+  -I../lib -I$(top_srcdir)/lib \
+  -I../intl -I$(top_srcdir)/../gettext-runtime/intl
+DEFS = \
+  -DLOCALEDIR=\"$(localedir)\" \
+  -DUSEJEXE=$(USEJEXE) \
+  -DGETTEXTJEXEDIR=\"$(pkglibdir)\" \
+  -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
+  -DLIBDIR=\"$(libdir)\" \
+  -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
+  -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
 LDADD = ../lib/libgettextlib.la @LTLIBINTL@
 
 SED = sed
@@ -100,8 +110,6 @@ LTV_AGE=0
 LIBUNINAME = ../libuniname/libuniname.a
 
 # Source dependencies.
-gettext_SOURCES = gettext.c
-ngettext_SOURCES = ngettext.c
 msgcmp_SOURCES = msgcmp.c
 msgfmt_SOURCES = msgfmt.c write-mo.c write-java.c write-tcl.c plural-eval.c
 msgmerge_SOURCES = msgmerge.c
@@ -144,8 +152,6 @@ libgettextpo_la_LDFLAGS = \
   libgettextsrc.la -lc -no-undefined
 
 # Link dependencies.
-gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
-ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
 msgcmp_LDADD = libgettextsrc.la
 msgfmt_LDADD = libgettextsrc.la
 msgmerge_LDADD = libgettextsrc.la
@@ -184,20 +190,20 @@ DISTCLEANFILES += po-gram-gen2.h
 # Special rules for installation of auxiliary programs.
 
 install-exec-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)
-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/hostname$(EXEEXT)
-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/urlget$(EXEEXT)
-	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(libdir)/$(PACKAGE)/user-email
-	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(libdir)/$(PACKAGE)/project-id
+	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(pkglibdir)/urlget$(EXEEXT)
+	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(pkglibdir)/user-email
+	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(pkglibdir)/project-id
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)
+	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 
 uninstall-local:
-	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/hostname$(EXEEXT)
-	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/urlget$(EXEEXT)
-	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/user-email
-	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/project-id
+	$(RM) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
+	$(RM) $(DESTDIR)$(pkglibdir)/urlget$(EXEEXT)
+	$(RM) $(DESTDIR)$(pkglibdir)/user-email
+	$(RM) $(DESTDIR)$(pkglibdir)/project-id
 
 DISTCLEANFILES += user-email
 
@@ -236,9 +242,9 @@ CLEANFILES += gnu.gettext.DumpResource$(EXEEXT) gnu.gettext.GetURL$(EXEEXT) \
 
 install-exec-local: install-exec-java-@BUILDJAVAEXE@
 install-exec-java-yes: all-java-yes
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)
-	$(INSTALL_PROGRAM) gnu.gettext.DumpResource$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/gnu.gettext.DumpResource$(EXEEXT)
-	$(INSTALL_PROGRAM) gnu.gettext.GetURL$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/gnu.gettext.GetURL$(EXEEXT)
+	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(INSTALL_PROGRAM) gnu.gettext.DumpResource$(EXEEXT) $(DESTDIR)$(pkglibdir)/gnu.gettext.DumpResource$(EXEEXT)
+	$(INSTALL_PROGRAM) gnu.gettext.GetURL$(EXEEXT) $(DESTDIR)$(pkglibdir)/gnu.gettext.GetURL$(EXEEXT)
 install-exec-java-no:
 
 install-data-local: install-data-java-@BUILDJAVAEXE@
@@ -250,7 +256,7 @@ install-data-java-no-no:
 
 installdirs-local: installdirs-java-@BUILDJAVAEXE@
 installdirs-java-yes:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)
+	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 installdirs-java-no: installdirs-java-no-@BUILDJAVA@
 installdirs-java-no-yes:
 	$(mkinstalldirs) $(DESTDIR)$(jardir)
@@ -258,8 +264,8 @@ installdirs-java-no-no:
 
 uninstall-local: uninstall-java-@BUILDJAVAEXE@
 uninstall-java-yes:
-	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/gnu.gettext.DumpResource$(EXEEXT)
-	$(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/gnu.gettext.GetURL$(EXEEXT)
+	$(RM) $(DESTDIR)$(pkglibdir)/gnu.gettext.DumpResource$(EXEEXT)
+	$(RM) $(DESTDIR)$(pkglibdir)/gnu.gettext.GetURL$(EXEEXT)
 uninstall-java-no: uninstall-java-no-@BUILDJAVA@
 uninstall-java-no-yes:
 	$(RM) $(DESTDIR)$(jardir)/gettext.jar
diff --git a/gettext-tools/src/plural.c b/gettext-tools/src/plural.c
index 69f4046d2..a0e6d3598 100644
--- a/gettext-tools/src/plural.c
+++ b/gettext-tools/src/plural.c
@@ -1,5 +1,5 @@
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify
@@ -18,5 +18,5 @@
 
 /* Include the expression parsing code from libintl, with different function
    names.  */
-#include "../intl/plural.c"
-#include "../intl/plural-exp.c"
+#include "../../gettext-runtime/intl/plural.c"
+#include "../../gettext-runtime/intl/plural-exp.c"
diff --git a/gettext-tools/src/user-email.in b/gettext-tools/src/user-email.in
index 9a441830a..4157831c1 100644
--- a/gettext-tools/src/user-email.in
+++ b/gettext-tools/src/user-email.in
@@ -45,10 +45,10 @@ exec_prefix="@exec_prefix@"
 # hostname on some systems (SVR3.2, old Linux) returns a bogus exit status,
 # so uname gets run too, so we keep only the first line of output.
 #host=`(hostname || uname -n) 2>/dev/null | sed 1q`
-host=`@libdir@/@PACKAGE@/hostname --short 2>/dev/null | sed 1q`
+host=`@libdir@/gettext/hostname --short 2>/dev/null | sed 1q`
 
 # Find the hostname.
-hostfqdn=`@libdir@/@PACKAGE@/hostname --fqdn 2>/dev/null | sed 1q`
+hostfqdn=`@libdir@/gettext/hostname --fqdn 2>/dev/null | sed 1q`
 
 # Find a list of email addresses from various mailer configuration files.
 # All mailers use configuration files under $HOME. We handle them in a
diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 66adf4c9b..bd205db2b 100644
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile for the check subdirectory of the GNU NLS Utilities
+## Makefile for the gettext-tools/tests subdirectory of GNU gettext
 ## Copyright (C) 1995-1997, 2001-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -60,42 +60,14 @@ TESTS = gettext-1 gettext-2 \
 	format-tcl-1 format-tcl-2 \
 	format-ycp-1 format-ycp-2 \
 	plural-1 plural-2 \
-	lang-c lang-c++ lang-objc lang-python lang-clisp lang-elisp lang-librep lang-smalltalk lang-java lang-gawk lang-pascal lang-ycp lang-tcl lang-php lang-po lang-rst \
-	rpath-1a rpath-1b \
-	rpath-2aaa rpath-2aab rpath-2aac rpath-2aad \
-	rpath-2aba rpath-2abb rpath-2abc rpath-2abd \
-	rpath-2baa rpath-2bab rpath-2bac rpath-2bad \
-	rpath-2bba rpath-2bbb rpath-2bbc rpath-2bbd \
-	rpath-3aaa rpath-3aab rpath-3aac rpath-3aad \
-	           rpath-3aaf            rpath-3aah \
-	rpath-3aba rpath-3abb rpath-3abc rpath-3abd \
-	           rpath-3abf            rpath-3abh \
-	rpath-3baa rpath-3bab rpath-3bac rpath-3bad \
-	rpath-3bae rpath-3baf rpath-3bag rpath-3bah \
-	rpath-3bba rpath-3bbb rpath-3bbc rpath-3bbd \
-	rpath-3bbe rpath-3bbf rpath-3bbg rpath-3bbh
+	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python lang-clisp \
+	lang-elisp lang-librep lang-smalltalk lang-java lang-gawk lang-pascal \
+	lang-wxwindows lang-ycp lang-tcl lang-perl lang-php lang-pike lang-po \
+	lang-rst
 
 EXTRA_DIST = $(TESTS) \
 	test.mo xg-test1.ok.po mex-test2.ok msguniq-a.in msguniq-a.out \
-	rpathx/configure.in rpathx/aclocal.m4 rpathx/configure \
-	rpathx/Makefile.am rpathx/Makefile.in rpathx/rpathx.c \
-	rpathy/configure.in rpathy/aclocal.m4 rpathy/configure \
-	rpathy/Makefile.am rpathy/Makefile.in rpathy/rpathy.c \
-	rpathz/configure.in rpathz/aclocal.m4 rpathz/configure \
-	rpathz/Makefile.am rpathz/Makefile.in rpathz/rpathz.c \
-	rpathlx/configure.in rpathlx/aclocal.m4 rpathlx/configure \
-	rpathlx/Makefile.am rpathlx/Makefile.in rpathlx/usex.c \
-	rpathly/configure.in rpathly/aclocal.m4 rpathly/configure \
-	rpathly/Makefile.am rpathly/Makefile.in rpathly/usey.c \
-	rpathlyx/configure.in rpathlyx/aclocal.m4 rpathlyx/configure \
-	rpathlyx/Makefile.am rpathlyx/Makefile.in rpathlyx/usey.c \
-	rpathlz/configure.in rpathlz/aclocal.m4 rpathlz/configure \
-	rpathlz/Makefile.am rpathlz/Makefile.in rpathlz/usez.c \
-	rpathlzyx/configure.in rpathlzyx/aclocal.m4 rpathlzyx/configure \
-	rpathlzyx/Makefile.am rpathlzyx/Makefile.in rpathlzyx/usez.c \
-	rpath-1 rpath-2_a rpath-2_b rpath-3_a rpath-3_b rpath.README \
-	rpath-3aae rpath-3aag rpath-3abe rpath-3abg \
-	rpathcfg.sh
+	ChangeLog.0
 
 XGETTEXT = ../src/xgettext
 
@@ -126,15 +98,16 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH \
 		    CONFIG_SHELL='$(SHELL)' \
 		    $(SHELL)
 
-xg-test1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c \
-		$(top_srcdir)/src/gettext.c
+xg-test1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
 	$(XGETTEXT) -d xg-test1.ok -p $(srcdir) \
 	  -k_ --omit-header --no-location \
-	  $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c \
-	  $(top_srcdir)/src/gettext.c
+	  $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
 
 # Three auxiliary programs used by the tests.
-INCLUDES = -I.. -I../lib -I$(top_srcdir)/lib -I$(top_srcdir)/intl
+INCLUDES = \
+  -I.. \
+  -I../lib -I$(top_srcdir)/lib \
+  -I$(top_srcdir)/../gettext-runtime/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
 LDADD_yes = ../intl/libintl.la
@@ -150,14 +123,3 @@ fc3_SOURCES = format-c-3-prg.c setlocale.c
 fc3_LDADD = ../lib/libgettextlib.la $(LDADD)
 fc4_SOURCES = format-c-4-prg.c setlocale.c
 fc4_LDADD = ../lib/libgettextlib.la $(LDADD)
-
-# Help maintaining config.rpath.
-rpathcfg: rpathcfg.sh
-	top_srcdir=$(top_srcdir) \
-	CONFIG_SHELL='$(SHELL)' \
-	CC='@CC@' GCC='@GCC@' \
-	LDFLAGS='@LDFLAGS@' \
-	LD='@LD@' with_gnu_ld='@with_gnu_ld@' \
-	host='@host@' \
-	$(SHELL) $(srcdir)/rpathcfg.sh > rpathcfg 2> rpathcfg.log
-MOSTLYCLEANFILES = rpathcfg rpathcfg.log
diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index 3750ea38f..08415eaf6 100755
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -62,9 +62,9 @@ top_builddir=..
 tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}"
 # Compile in two steps from .cc to .o and from .o to 'prog'. This way,
 # relinking is faster because doesn't need to redo the first step.
-${CXX} ${CXXFLAGS} ${CPPFLAGS} -c prog.cc -I.. -I$top_srcdir/libasprintf -I$top_srcdir/lib -I../intl \
+${CXX} ${CXXFLAGS} ${CPPFLAGS} -c prog.cc -I.. -I$top_srcdir/../gettext-runtime/libasprintf -I$top_srcdir/lib -I../intl \
   || exit 1
-${LIBTOOL} --quiet --mode=link ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../libasprintf/libasprintf.la ../lib/libgettextlib.la ${LTLIBINTL} \
+${LIBTOOL} --quiet --mode=link ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../lib/libgettextlib.la ${LTLIBINTL} \
   || exit 1
 
 tmpfiles="$tmpfiles prog.pot"
diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index f98efb5e1..0eae76165 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -32,7 +32,7 @@ EOF
 
 tmpfiles="$tmpfiles Program.class"
 : ${JAVACOMP="/bin/sh ../lib/javacomp.sh"}
-CLASSPATH=../intl-java/libintl.jar ${JAVACOMP} -d . Program.java || exit 1
+CLASSPATH=../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d . Program.java || exit 1
 
 tmpfiles="$tmpfiles prog.pot"
 : ${XGETTEXT=xgettext}
@@ -100,7 +100,7 @@ EUR remplace FF.
 EOF
 
 : ${JAVAEXEC="/bin/sh ../lib/javaexec.sh"}
-LANGUAGE= LC_ALL=fr_FR CLASSPATH=.:../intl-java/libintl.jar ${JAVAEXEC} Program 2 > prog.out || exit 1
+LANGUAGE= LC_ALL=fr_FR CLASSPATH=.:../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 > prog.out || exit 1
 ${DIFF} prog.ok prog.out || exit 1
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-1 b/gettext-tools/tests/xgettext-1
index f40a6abda..c071004e8 100755
--- a/gettext-tools/tests/xgettext-1
+++ b/gettext-tools/tests/xgettext-1
@@ -11,7 +11,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles xg-test1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-test1 -k_ --omit-header --no-location \
- $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c $top_srcdir/src/gettext.c
+ $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
diff --git a/gettext-tools/tests/xgettext-3 b/gettext-tools/tests/xgettext-3
index 34fd2df87..945215170 100755
--- a/gettext-tools/tests/xgettext-3
+++ b/gettext-tools/tests/xgettext-3
@@ -12,7 +12,7 @@ tmpfiles="$tmpfiles zero-domain.po xg-test3.err"
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext.pot \
+${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext-tools.pot \
   $top_srcdir/src/xgettext.c >xg-test3.err 2>&1
 result=$?
 cat xg-test3.err | grep -v 'warning: Charset' | grep -v '^ '