diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:17:25 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:27:55 -0600 |
| commit | 8339d33a24e9810ae23544f0f4d1a52bd732c49f (patch) | |
| tree | a6abde09cc02596251da93980aede8ba4c85229d | |
| parent | 55df380f008851af859970bfb88942b8872f9cda (diff) | |
fdo#70393: move openldap to a subdir of external
Change-Id: I0225484e976b5317c2ac5d5b50ade153425f22b0
Reviewed-on: https://gerrit.libreoffice.org/6546
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/openldap/ExternalProject_openldap.mk (renamed from openldap/ExternalProject_openldap.mk) | 0 | ||||
| -rw-r--r-- | external/openldap/Makefile (renamed from openldap/Makefile) | 2 | ||||
| -rw-r--r-- | external/openldap/Module_openldap.mk (renamed from openldap/Module_openldap.mk) | 0 | ||||
| -rw-r--r-- | external/openldap/UnpackedTarball_openldap.mk (renamed from openldap/UnpackedTarball_openldap.mk) | 2 | ||||
| -rw-r--r-- | external/openldap/openldap-2.4.31.patch (renamed from openldap/openldap-2.4.31.patch) | 0 |
7 files changed, 3 insertions, 3 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 1b9b9d350415..a5500abfe152 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ officecfg \ oovbaapi \ oox \ - $(call gb_Helper_optional,OPENLDAP,openldap) \ $(call gb_Helper_optional,OPENSSL,openssl) \ package \ padmin \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 8321a2e9023e..23ca67de94d9 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,NEON,neon) \ $(call gb_Helper_optional,NSS,nss) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ + $(call gb_Helper_optional,OPENLDAP,openldap) \ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ diff --git a/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk index 36c844c0b6d5..36c844c0b6d5 100644 --- a/openldap/ExternalProject_openldap.mk +++ b/external/openldap/ExternalProject_openldap.mk diff --git a/openldap/Makefile b/external/openldap/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/openldap/Makefile +++ b/external/openldap/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/openldap/Module_openldap.mk b/external/openldap/Module_openldap.mk index cb3f0ce23b5d..cb3f0ce23b5d 100644 --- a/openldap/Module_openldap.mk +++ b/external/openldap/Module_openldap.mk diff --git a/openldap/UnpackedTarball_openldap.mk b/external/openldap/UnpackedTarball_openldap.mk index 43e3e2a225ed..f22cb977752c 100644 --- a/openldap/UnpackedTarball_openldap.mk +++ b/external/openldap/UnpackedTarball_openldap.mk @@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap)) $(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap)) $(eval $(call gb_UnpackedTarball_add_patches,openldap,\ - openldap/openldap-2.4.31.patch \ + external/openldap/openldap-2.4.31.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/openldap/openldap-2.4.31.patch b/external/openldap/openldap-2.4.31.patch index 656a2c9ebd2d..656a2c9ebd2d 100644 --- a/openldap/openldap-2.4.31.patch +++ b/external/openldap/openldap-2.4.31.patch |