[gspell] Revert "build: use GSPELL_API_VERSION in po/"



commit 18efe7c40d0d7fb3cfa56ddb1d5a865c21333e89
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Mar 13 17:53:46 2016 +0100

    Revert "build: use GSPELL_API_VERSION in po/"
    
    This reverts commit a9b3e03686ea26151e7577270a7ea16a46dd2a5b.
    
    It causes problems with builddir != srcdir when building from git.

 Makefile.am                  |   10 ++--------
 configure.ac                 |    1 -
 po/{Makevars.in => Makevars} |    2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ef04bd2..fc58994 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,8 @@
 SUBDIRS = gspell po docs tests testsuite
 
 pkgconfig_DATA = gspell-$(GSPELL_API_VERSION).pc
-
-EXTRA_DIST = \
-       gspell.pc.in \
-       po/Makevars.in
-
-DISTCLEANFILES = \
-       $(pkgconfig_DATA) \
-       po/Makevars
+DISTCLEANFILES = $(pkgconfig_DATA)
+EXTRA_DIST = gspell.pc.in
 
 MAINTAINERCLEANFILES = \
        ABOUT-NLS \
diff --git a/configure.ac b/configure.ac
index 56c4c90..0591764 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,7 +210,6 @@ AC_CONFIG_FILES([
        gspell/Makefile
        gspell/resources/Makefile
        po/Makefile.in
-       po/Makevars
        tests/Makefile
        testsuite/Makefile
 ])
diff --git a/po/Makevars.in b/po/Makevars
similarity index 98%
rename from po/Makevars.in
rename to po/Makevars
index 3469d92..c8feb08 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 = gspell- GSPELL_API_VERSION@
+DOMAIN = gspell-1
 
 # 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]