]> git.ipfire.org Git - thirdparty/gettext.git/commit
Fix conflict between different uses of GETTEXTLIBDIR.
authorBruno Haible <bruno@clisp.org>
Tue, 2 Oct 2018 13:25:53 +0000 (15:25 +0200)
committerBruno Haible <bruno@clisp.org>
Fri, 5 Oct 2018 21:44:05 +0000 (23:44 +0200)
commit2cf0ff0e000f3cd804f60800e2d9853529a9a321
treec316719d52edd6540079be1f21a190ab6f0bcad6
parent86cd0609c08b4b0aa03b120bab37098f3c179b11
Fix conflict between different uses of GETTEXTLIBDIR.

Rationale: The programs installed in $(prefix)/lib/gettext/ are at different
locations before installation: some are in the source tree, some are in the
build tree.

* gettext-tools/src/msginit.c (project_id, project_id_version): Test
GETTEXTLIBDIR_SRCDIR, not GETTEXTLIBDIR.
(plural_forms): Test GETTEXTLIBDIR_BUILDDIR, not GETTEXTLIBDIR.
* gettext-tools/tests/msginit-3: Set GETTEXTLIBDIR_SRCDIR, not GETTEXTLIBDIR.
* gettext-tools/tests/msginit-4: Set both GETTEXTLIBDIR_SRCDIR and
GETTEXTLIBDIR_BUILDDIR.
gettext-tools/src/msginit.c
gettext-tools/tests/msginit-3
gettext-tools/tests/msginit-4