[svn-commits] jpeeler: trunk r271 - /trunk/Makefile

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Aug 18 13:49:10 2009
New Revision: 271

URL: http://svn.asterisk.org/svn-view/libss7?view=rev&rev=271
Log:
Fix ldconfig error when building with fakeroot

This patch copies the built shared libraries along with the symlinks. Also,
ldconfig is always attempted with errors ignored since while using fakeroot
updating the cache will fail. People running making install not as root are
going to encounter problems before the removed root check anyway.

(closes issue #13313)
Reported by: tzafrir
Patches:
      libss7_ldconfig.diff uploaded by tzafrir (license 46)
Tested by: tzafrir


Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.asterisk.org/svn-view/libss7/trunk/Makefile?view=diff&rev=271&r1=270&r2=271
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Aug 18 13:49:10 2009
@@ -45,10 +45,9 @@
 	mkdir -p $(INSTALL_PREFIX)$(libdir)
 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
 	install -m 644 libss7.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
-	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libss7.so.1 libss7.so ; ln -sf libss7.so.1.0 libss7.so.1 )
+	cp -dp *.so* $(INSTALL_PREFIX)$(libdir)
 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-	if test $$(id -u) = 0; then $(LDCONFIG); fi
+	$(LDCONFIG) 2> /dev/null || :
 
 $(STATIC_LIBRARY): $(STATIC_OBJS)
 	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)