1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
Description: Install Bundles in a versioned directory as per Policy ยง8.2.
Thanks to Paul Gevers for pointing out this deficiency.
Author: Yavor Doganov <yavor@gnu.org>
Applied-Upstream: 1.8.0
Last-Update: 2014-07-15
---
--- gnustep-sqlclient.orig/GNUmakefile
+++ gnustep-sqlclient/GNUmakefile
@@ -49,7 +49,7 @@
BUNDLE_NAME=
-BUNDLE_INSTALL_DIR=$(GNUSTEP_BUNDLES)/SQLClient
+BUNDLE_INSTALL_DIR=$(GNUSTEP_BUNDLES)/SQLClient$(SQLClient_INTERFACE_VERSION)
# In some systems and situations the dynamic linker needs to haved the
# SQLClient, gnustep-base, and objc libraries explicityly linked into
--- gnustep-sqlclient.orig/GNUmakefile.preamble
+++ gnustep-sqlclient/GNUmakefile.preamble
@@ -12,7 +12,7 @@
#
# Additional flags to pass to the preprocessor
-# ADDITIONAL_CPPFLAGS +=
+ADDITIONAL_CPPFLAGS += -DSOVERSION=\"$(SQLClient_INTERFACE_VERSION)\"
# Additional flags to pass to the Objective-C compiler
# ADDITIONAL_OBJCFLAGS +=
--- gnustep-sqlclient.orig/SQLClient.m
+++ gnustep-sqlclient/SQLClient.m
@@ -2242,7 +2242,8 @@
{
path = [paths objectAtIndex: count];
path = [path stringByAppendingPathComponent: @"Bundles"];
- path = [path stringByAppendingPathComponent: @"SQLClient"];
+ path = [path stringByAppendingPathComponent:
+ @"SQLClient"SOVERSION""];
path = [path stringByAppendingPathComponent: s];
path = [path stringByAppendingPathExtension: @"bundle"];
bundle = [NSBundle bundleWithPath: path];
|