[gegl] Revert "Restore the versioning of the installed *.mo files"
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] Revert "Restore the versioning of the installed *.mo files"
- Date: Tue, 14 Nov 2017 15:52:11 +0000 (UTC)
commit 8b8d302c9981b5e984e720a3f7461340fb8971ba
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Nov 14 16:32:27 2017 +0100
Revert "Restore the versioning of the installed *.mo files"
This broke builddir != srcdir builds in GNOME Continuous:
Making all in po
make[2]: Entering directory '/ostbuild/source/gegl/_build/po'
make[2]: *** No rule to make target '/config.status', needed by
'Makefile'. Stop.
make[2]: Leaving directory '/ostbuild/source/gegl/_build/po'
Makefile:643: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/ostbuild/source/gegl/_build'
Makefile:550: recipe for target 'all' failed
make: *** [all] Error 2
This reverts commit dc19cf4fd198eae137ce06ca08f6c1e847dc1678.
https://bugzilla.gnome.org/show_bug.cgi?id=789010
Makefile.am | 9 ---------
configure.ac | 1 -
po/.gitignore | 1 -
po/{Makevars.in => Makevars} | 2 +-
4 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a73a50b..2b6ff96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ EXTRA_DIST = \
autogen.sh \
gegl-uninstalled.pc.in \
m4/introspection.m4 \
- po/Makevars.in \
gegl.pc.in
# DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
@@ -40,14 +39,6 @@ EXTRA_DIST = \
DISTCLEANFILES = \
$(built_dist_files)
-# The generated po/Makevars shouldn't be distributed, or we need a way
-# to insert custom variables in Gettext's Makevars. Failing that, this
-# stops distcheck from complaining about po/Makevars not getting removed
-# after a distclean.
-distcleancheck_listfiles = \
- find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
- sh '{}' ';'
-
if HAVE_W3M
dist-check-w3m:
NEWS: docs/NEWS.html
diff --git a/configure.ac b/configure.ac
index a297c13..e5af760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1317,7 +1317,6 @@ operations/transform/Makefile
operations/workshop/Makefile
operations/workshop/external/Makefile
operations/workshop/generated/Makefile
-po/Makevars
tools/Makefile
docs/Makefile
docs/index.txt
diff --git a/po/.gitignore b/po/.gitignore
index 9f34df9..f851f28 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -4,7 +4,6 @@
/Makefile
/Makefile.in
/Makefile.in.in
-/Makevars
/Makevars.template
/POTFILES
/Rules-quot
diff --git a/po/Makevars.in b/po/Makevars
similarity index 99%
rename from po/Makevars.in
rename to po/Makevars
index a80410e..5d3a61e 100644
--- a/po/Makevars.in
+++ b/po/Makevars
@@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
-DOMAIN = @GETTEXT_PACKAGE@
+DOMAIN = $(PACKAGE)
# These two variables depend on the location of this directory.
subdir = po
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]