summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--mythes/ExternalProject_mythes.mk6
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 276e991be1c8..d53c6a34ef82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8840,6 +8840,8 @@ if test "$with_system_hunspell" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO
+ HUNSPELL_CFLAGS="-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell"
+ HUNSPELL_LIBS="-L${OUTDIR}/lib -lhunspell"
HUNSPELL_TARBALL="3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz"
BUILD_TYPE="$BUILD_TYPE HUNSPELL"
fi
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 1d2ab7bc8668..b146823c6f5a 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -21,10 +21,8 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
cd $(EXTERNAL_WORKDIR) \
&& ./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
- $(if $(filter NO,$(SYSTEM_HUNSPELL)), \
- HUNSPELL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)" \
- HUNSPELL_LIBS="-L$(OUTDIR)/lib -lhunspell" \
- ) \
+ HUNSPELL_CFLAGS=" $(HUNSPELL_CFLAGS)" \
+ HUNSPELL_LIBS=" $(HUNSPELL_LIBS)" \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
&& touch $@