diff options
| author | David Tardon <dtardon@redhat.com> | 2016-01-13 14:21:10 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-01-25 15:29:55 +0000 |
| commit | f52464d93c45917800aa4cfe3aa4664e2276a210 (patch) | |
| tree | a140d0b19d1dc797b9aea38729e9db0c26b8403e | |
| parent | 9dfc7390a1b3d14aef9ef6b75abac40c44f4776a (diff) | |
move def. of liblangtag inc. path to configure
Change-Id: Idef3015bf7b7bb5e0d984ac0b0a2163172cacc17
(cherry picked from commit 345135002ae030bd3cd3d4bde594c14affc860a2)
Reviewed-on: https://gerrit.libreoffice.org/21543
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 17ee83f108c4e7c00218ea09dbbffdf9989da0ae)
Reviewed-on: https://gerrit.libreoffice.org/21778
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2a80542f064a..836196120392 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1069,7 +1069,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ define gb_LinkTarget__use_liblangtag $(call gb_LinkTarget_use_unpacked,$(1),langtag) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,langtag) \ + $(LIBLANGTAG_CFLAGS) \ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS)) diff --git a/configure.ac b/configure.ac index 6e5abf8f7ddf..128daf0fa714 100644 --- a/configure.ac +++ b/configure.ac @@ -11853,6 +11853,7 @@ if test "$enable_liblangtag" = "yes" -o \ SYSTEM_LIBLANGTAG= AC_MSG_RESULT([no]) BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" + LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/langtag" if test "$COM" = "MSC"; then LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib" else |