[SCM] Debian packaging for bibutils branch, master, updated. upstream/4.5-81-g6fbbf2b

David Bremner bremner at unb.ca
Fri Dec 10 03:56:21 UTC 2010


The following commit has been merged in the master branch:
commit 0b47494112b95b2dabf69b9032bd6ddec0f4477b
Author: David Bremner <bremner at unb.ca>
Date:   Thu Dec 2 09:19:30 2010 -0400

    Replace hard coded soname and share library names with variables,
    initialized to the previous values.  This makes it easier for people
    to choose different soname schemes as required by the local
    environment.  In particular, in Debian we already use a libtool
    compatible scheme for libbibutils, and switching to a release based
    scheme would cause difficulties.

diff --git a/lib/Makefile.dynamic b/lib/Makefile.dynamic
index 04a4624..450582d 100644
--- a/lib/Makefile.dynamic
+++ b/lib/Makefile.dynamic
@@ -27,6 +27,9 @@ BIBCORE_OBJS = $(SIMPLE_OBJS) $(NEWSTR_OBJS) $(CONTAIN_OBJS) $(BIBL_OBJS) \
 
 BIBUTILS_OBJS = $(INPUT_OBJS) $(OUTPUT_OBJS) bibutils.o
 
+SONAME=libbibutils.so.4
+SOMINOR=12
+SOFULL=$(SONAME).$(SOMINOR)
 
 all: libbibutils.so
 
@@ -34,20 +37,21 @@ all: libbibutils.so
 	$(CC) -fPIC -c $(CFLAGS) -o $@ $<
 
 libbibutils.so: $(BIBCORE_OBJS) $(BIBUTILS_OBJS)
-	$(CC) -shared -Wl,-soname,libbibutils.so.4 -o libbibutils.so.4.12 $^
-	ln -s libbibutils.so.4.12 libbibutils.so.4
-	ln -s libbibutils.so.4.12 libbibutils.so
+	$(CC) -shared -Wl,-soname,$(SONAME) -o $(SOFULL) $^
+	ln -sf $(SOFULL) $(SONAME)
+	ln -sf $(SOFULL) libbibutils.so
 
 install:
 	echo INSTALLING LIBRARIES TO $(LIBINSTALLDIR)
-	cp libbibutils.so.4.12 $(LIBINSTALLDIR)
-	ln -sf $(LIBINSTALLDIR)/libbibutils.so.4.12 $(LIBINSTALLDIR)/libbibutils.so
-	ln -sf $(LIBINSTALLDIR)/libbibutils.so.4.12 $(LIBINSTALLDIR)/libbibutils.so.4
+	mkdir -p $(LIBINSTALLDIR)
+	cp $(SOFULL) $(LIBINSTALLDIR)
+	ln -sf $(LIBINSTALLDIR)/$(SOFULL) $(LIBINSTALLDIR)/libbibutils.so
+	ln -sf $(LIBINSTALLDIR)/$(SOFULL) $(LIBINSTALLDIR)/$(SONAME)
 
 clean: 
 	/bin/rm -f *.o core
 
 realclean:
-	/bin/rm -f *.o *.so *.so.4 *.so.4.12 core
+	/bin/rm -f *.o *.so $(SOFULL) $(SONAME) core
 
 test:

-- 
Debian packaging for bibutils



More information about the debian-science-commits mailing list