diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-07 10:51:55 +0100 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-16 16:40:10 +0200 |
| commit | 002e9c5a830de0ddc4b3127e6485af263a52fa24 (patch) | |
| tree | d5905ab129f3e760be13ec25d54bd6660603c271 /firebird/ExternalPackage_firebird.mk | |
| parent | e1d4f2767c4c7c2766fac688720b12002ffc8b2a (diff) | |
Fix firebird installation (windows) + driver compilation fixes.
Change-Id: I253a2770c951a984bd50c906b0e84feeb8d105d9
Diffstat (limited to 'firebird/ExternalPackage_firebird.mk')
| -rw-r--r-- | firebird/ExternalPackage_firebird.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk index 844678a57962..e29ef44a839b 100644 --- a/firebird/ExternalPackage_firebird.mk +++ b/firebird/ExternalPackage_firebird.mk @@ -39,15 +39,13 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) # gen/firebird/security2.fdb \ # )) -$(eval $(call gb_ExternalPackage_set_outdir,firebird,$(INSTDIR))) - ifeq ($(OS)-$(COM),WNT-MSC) -$(eval $(call gb_ExternalPackage_add_file,firebird,ifbembed.dll,gen/firebird/bin/ifbembed.dll)) -$(eval $(call gb_ExternalPackage_add_file,firebird,ifbembed.lib,gen/firebird/bin/ifbembed.lib)) +$(eval $(call gb_ExternalPackage_add_file,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib)) else -$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) -$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5)) -$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so,gen/firebird/lib/libfbembed.so)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so)) endif # vim: set noet sw=4 ts=4: |