diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-18 14:07:27 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-02-20 14:28:10 +0100 |
| commit | ad3b8a779db8f5ba908c59155328a4912ee0941d (patch) | |
| tree | e8ac1bdb025c1c5901595aca8d4cdedc060acc80 /mythes | |
| parent | 55892c6bd740fa0c667656cbb246327f2bb76007 (diff) | |
fix mingw build of mythes with system hunspell
Diffstat (limited to 'mythes')
| -rw-r--r-- | mythes/makefile.mk | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/mythes/makefile.mk b/mythes/makefile.mk index 46520fc7568e..44f8ba9d6582 100644 --- a/mythes/makefile.mk +++ b/mythes/makefile.mk @@ -46,15 +46,15 @@ PATCH_FILES=\ mythes-1.2.0-makefile-mk.diff \ mythes-1.2.0-android.patch -.IF "$(GUI)"=="UNX" -CONFIGURE_DIR=$(BUILD_DIR) - -.IF "$(SYSTEM_MYTHES)" != "YES" - +.IF "$(COM)"=="GCC" .IF "$(SYSTEM_HUNSPELL)" != "YES" HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.3 .ENDIF +.ENDIF + +.IF "$(GUI)"=="UNX" +CONFIGURE_DIR=$(BUILD_DIR) #relative to CONFIGURE_DIR # still needed also in system-mythes case as it creates the makefile @@ -86,17 +86,15 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff BUILD_ACTION=make OUT2INC += mythes.hxx -.ENDIF .ENDIF # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -.IF "$(SYSTEM_MYTHES)" != "YES" CONFIGURE_ACTION=configure CONFIGURE_FLAGS= --disable-shared --with-pic \ - HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \ - HUNSPELL_LIBS="-L$(SOLARLIBDIR) -lhunspell-1.3" + HUNSPELL_CFLAGS="$(HUNSPELL_CFLAGS)" \ + HUNSPELL_LIBS="$(HUNSPELL_LIBS)" .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no @@ -104,7 +102,6 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff BUILD_ACTION=make -.ENDIF .ELSE BUILD_ACTION=dmake .ENDIF # "$(COM)"=="GCC" |