diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 22:36:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-27 00:50:02 +0200 |
| commit | 349015b18e285b9642e0b16a5e4db61ef347a6a8 (patch) | |
| tree | be3b36ba75e167cea6d13f91e26fcc596e9e2d28 /external/lpsolve | |
| parent | 90d7723085a8da0929c7c17587a7717ceeb23d36 (diff) | |
gbuild: remove gb_ExternalPackage_add_library_for_install
Deliver all external libraries to INSTDIR directly.
Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
Diffstat (limited to 'external/lpsolve')
| -rw-r--r-- | external/lpsolve/ExternalPackage_lpsolve.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/external/lpsolve/ExternalPackage_lpsolve.mk b/external/lpsolve/ExternalPackage_lpsolve.mk index 663b247abf9e..bd2715ad7a19 100644 --- a/external/lpsolve/ExternalPackage_lpsolve.mk +++ b/external/lpsolve/ExternalPackage_lpsolve.mk @@ -9,15 +9,17 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve)) +$(eval $(call gb_ExternalPackage_set_outdir,lpsolve,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve)) ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),WNT) -$(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,bin/lpsolve55.dll,lpsolve55/lpsolve55.dll)) +$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/lpsolve55.dll,lpsolve55/lpsolve55.dll)) else ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib)) +$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib)) else # $(OS) != WNT/MACOSX -$(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.so,lpsolve55/liblpsolve55.so)) +$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/liblpsolve55.so,lpsolve55/liblpsolve55.so)) endif # $(OS) endif # $(DISABLE_DYNLOADING) |