[SCM] stk/master: Fix install target for new soname scheme

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Fri Nov 27 23:49:39 UTC 2015


The following commit has been merged in the master branch:
commit 98b300b7a68f13326d23de02df51f6c7b5cec630
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Nov 27 20:35:33 2015 -0300

    Fix install target for new soname scheme

diff --git a/debian/patches/0005-Fix-install-target-for-new-soname-scheme.patch b/debian/patches/0005-Fix-install-target-for-new-soname-scheme.patch
new file mode 100644
index 0000000..d225c09
--- /dev/null
+++ b/debian/patches/0005-Fix-install-target-for-new-soname-scheme.patch
@@ -0,0 +1,32 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Fri, 27 Nov 2015 20:32:46 -0300
+Subject: Fix install target for new soname scheme
+
+---
+ src/Makefile.in | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 7904bbc..df82595 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -92,7 +92,6 @@ $(SHAREDLIB) : $(OBJECTS)
+ 	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+ 	$(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
+ 	$(LN) -s @sharedname@ $(SHAREDLIB)
+-#	$(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
+ 
+ install-headers:
+ 	install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
+@@ -100,9 +99,8 @@ install-headers:
+ 
+ install: $(SHAREDLIB) install-headers
+ 	install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
+-	install -m 644 $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)
+-	ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
+-	ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
++	install -m 644 @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)
++	ln -sf @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
+ 
+ 
+ $(OBJECTS) : Stk.h
diff --git a/debian/patches/series b/debian/patches/series
index 51c80b6..a2ab151 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Rename-demo-to-stk-demo.patch
 0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
 0004-File-endian.h-is-not-on-machine-subdir.patch
+0005-Fix-install-target-for-new-soname-scheme.patch

-- 
stk packaging



More information about the pkg-multimedia-commits mailing list