[svn-commits] trunk - r884 in /trunk: Makefile fxotune.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Tue Jan 10 14:27:06 2006
New Revision: 884

URL: http://svn.digium.com/view/zaptel?rev=884&view=rev
Log:
Fix versioning so correct libtonezone names and symlinks are generated. (issue #6189)

Modified:
    trunk/Makefile
    trunk/fxotune.c

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=884&r1=883&r2=884&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Jan 10 14:27:06 2006
@@ -264,7 +264,7 @@
 	ar rcs libtonezone.a $^
 
 $(LIBTONEZONE_SO): $(TZOBJS)
-	$(CC) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) -lm -o $@ $^
+	$(CC) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) -lm -o $@ $^
 
 ztcfg.c: ztcfg.h
 
@@ -367,7 +367,10 @@
 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
 	[ `id -u` = 0 ] && /sbin/ldconfig || :
 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
-	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
+	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
 	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h

Modified: trunk/fxotune.c
URL: http://svn.digium.com/view/zaptel/trunk/fxotune.c?rev=884&r1=883&r2=884&view=diff
==============================================================================
--- trunk/fxotune.c (original)
+++ trunk/fxotune.c Tue Jan 10 14:27:06 2006
@@ -6,7 +6,7 @@
  * fxotune.c -- A utility for tuning the various settings on the fxo
  * 		modules for the TDM400 cards.
  *
- * by Matthew Fredrickson
+ * by Matthew Fredrickson <creslin at digium.com>
  * 
  * (C) 2004-2005 Digium, Inc.
  */