[thirdparty-commits] qwell: libresample/trunk r199 - /libresample/trunk/Makefile.in

SVN commits to the Digium third-party software repository thirdparty-commits at lists.digium.com
Thu Jan 3 14:05:25 CST 2013


Author: qwell
Date: Thu Jan  3 14:05:21 2013
New Revision: 199

URL: http://svnview.digium.com/svn/thirdparty?view=rev&rev=199
Log:
Support setting libdir, for those weird distros that use silly arch splits.

Modified:
    libresample/trunk/Makefile.in

Modified: libresample/trunk/Makefile.in
URL: http://svnview.digium.com/svn/thirdparty/libresample/trunk/Makefile.in?view=diff&rev=199&r1=198&r2=199
==============================================================================
--- libresample/trunk/Makefile.in (original)
+++ libresample/trunk/Makefile.in Thu Jan  3 14:05:21 2013
@@ -24,6 +24,7 @@
 endif
 
 INSTALL_BASE:=/usr
+libdir?=$(INSTALL_BASE)/lib
 INSTALL_PREFIX:=$(DESTDIR)
 LDCONFIG:=/sbin/ldconfig
 
@@ -61,18 +62,18 @@
 	ln -sf $(DYNAMIC_LIBRARY) libresample.so
 
 install: all
-	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+	mkdir -p $(INSTALL_PREFIX)$(libdir)
 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
 ifneq (${OSARCH},SunOS)
 	install -m 644 include/libresample.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
-	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
-	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf $(DYNAMIC_LIBRARY) libresample.so)
-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
+	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
+	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libresample.so)
+	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
 else
 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 include/libresample.h
-	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
-	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf $(DYNAMIC_LIBRARY) libresample.so)
+	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
+	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libresample.so)
 endif
 
 tests/testresample: libresample.a tests/testresample.c




More information about the thirdparty-commits mailing list