# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License or as specified alternatively below. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # # Major Contributor(s): # Copyright (C) 2012 Red Hat, Inc., David Tardon # (initial developer) # # All Rights Reserved. # # For minor contributions see the git repository. # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 3 or later (the "GPLv3+"), or # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. # because the installation system is so incredibly inflexible... $(eval $(call gb_Package_Package,cpputools_bin,$(gb_Executable_BINDIR))) $(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: on value='distro/cib/libreoffice-5-2'>distro/cib/libreoffice-5-2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/mythes
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-10-29 12:02:36 +0100
committerMichael Stahl <mstahl@redhat.com>2012-10-29 12:03:34 +0100
commit67a23b6af991d383de5d431db9cc88d18f488b7c (patch)
treee0ca8b1120b799879e8ae57cce4efe100df57c55 /mythes
parentcda6b4e991f45ec870a311ab736038bd93227900 (diff)
move setup of HUNSPELL_CFLAGS etc. to configure
Change-Id: Id50ca2e0804d9e56334c9f7149dc4080a7fee729
Diffstat (limited to 'mythes')
-rw-r--r--mythes/ExternalProject_mythes.mk6
1 files changed, 2 insertions, 4 deletions
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 $@