Merge pull request #186 from rrthomas/masterv2.2.2

Compute libdir_subdir for the tests properly (fixes issue #185)

7 files changed, 20 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 2d6460d..e71cc8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,6 @@ matrix:
       env:
         - COMPILER=g++-5
     - os: osx
-      osx_image: xcode7.3
-    - os: osx
       osx_image: xcode9.2
     - compiler: gcc
       env:
diff --git a/bootstrap.conf b/bootstrap.conf
index 74a1738..a895a24 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,4 +1,4 @@
-# bootstrap.conf (Enchant) version 2018-01-15
+# bootstrap.conf (Enchant) version 2018-02-02
 
 # This file is part of Enchant.
 #
@@ -50,6 +50,7 @@ gnulib_modules='
         c99
         configmake
         flock
+        gnu-make
         manywarnings
         relocatable-lib-lgpl
         snippet/unused-parameter
diff --git a/configure.ac b/configure.ac
index c710dce..c0df29e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([enchant],[2.2.1])
+AC_INIT([enchant],[2.2.2])
 AC_CONFIG_SRCDIR(src/enchant.h)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -120,9 +120,6 @@ else
 fi
 AC_SUBST([ISYSTEM])
 
-libdir_subdir=`echo "$libdir" | sed -e 's|^${exec_prefix}/||'`
-AC_SUBST([libdir_subdir])
-
 # FIXME: Use just GLIB_CFLAGS, GLIB_LIBS
 ENCHANT_CFLAGS=$GLIB_CFLAGS
 ENCHANT_LIBS=$GLIB_LIBS
diff --git a/m4/.gitignore b/m4/.gitignore
index 4b92c1b..7ede777 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -56,3 +56,4 @@
 /rawmemchr.m4
 /strchrnul.m4
 /manywarnings-c++.m4
+/gnu-make.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 101df4f..7351b3f 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --local-dir=gl --local-dir=gl-mod/bootstrap --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl bootstrap c99 configmake flock manywarnings relocatable-lib-lgpl snippet/unused-parameter ssize_t strchrnul strdup-posix valgrind-tests
+#   gnulib-tool --import --local-dir=gl --local-dir=gl-mod/bootstrap --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl bootstrap c99 configmake flock gnu-make manywarnings relocatable-lib-lgpl snippet/unused-parameter ssize_t strchrnul strdup-posix valgrind-tests
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl:gl-mod/bootstrap])
@@ -36,6 +36,7 @@ gl_MODULES([
   c99
   configmake
   flock
+  gnu-make
   manywarnings
   relocatable-lib-lgpl
   snippet/unused-parameter
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 886034d..412b66e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,12 @@
 SUBDIRS = enchant_providers
 
+# Get libdir suffix
+if !GNU_MAKE
+libdir_subdir=$(shell echo "$(libdir)" | sed -e 's|^$(exec_prefix)/||' | sed -e 's|^/||')
+else
+libdir_subdir=lib
+endif
+
 AM_CPPFLAGS = -I$(top_srcdir)/src $(ENCHANT_CFLAGS) -DENCHANT_MAJOR_VERSION=\"@ENCHANT_MAJOR_VERSION@\"
 
 ENCHANT_CONFIG_DIR = config
diff --git a/tests/enchant_providers/Makefile.am b/tests/enchant_providers/Makefile.am
index 571946f..2ee03f5 100644
--- a/tests/enchant_providers/Makefile.am
+++ b/tests/enchant_providers/Makefile.am
@@ -1,5 +1,12 @@
 # FIXME: common up with tests/Makefile.am
 
+# Get libdir suffix
+if GNU_MAKE
+libdir_subdir=$(shell echo "$(libdir)" | sed -e 's|^$(exec_prefix)/||' | sed -e 's|^/||')
+else
+Tests require GNU Make!
+endif
+
 AM_CPPFLAGS = -I$(top_srcdir)/src $(ENCHANT_CFLAGS)
 
 ENCHANT_CONFIG_DIR = config