[libpri-commits] qwell: trunk r617 - in /trunk: ./ Makefile
SVN commits to the libpri project
libpri-commits at lists.digium.com
Wed Aug 6 13:22:43 CDT 2008
Author: qwell
Date: Wed Aug 6 13:22:43 2008
New Revision: 617
URL: http://svn.digium.com/view/libpri?view=rev&rev=617
Log:
Merged revisions 616 via svnmerge from
https://origsvn.digium.com/svn/libpri/branches/1.4
........
r616 | qwell | 2008-08-06 13:20:51 -0500 (Wed, 06 Aug 2008) | 1 line
Make install paths use libdir, like libss7
........
Modified:
trunk/ (props changed)
trunk/Makefile
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Aug 6 13:22:43 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-372,386,390,416,424,427,441,446,462,465,470,479,514,528,598,602
+/branches/1.4:1-372,386,390,416,424,427,441,446,462,465,470,479,514,528,598,602,616
Modified: trunk/Makefile
URL: http://svn.digium.com/view/libpri/trunk/Makefile?view=diff&rev=617&r1=616&r2=617
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Aug 6 13:22:43 2008
@@ -46,6 +46,7 @@
CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
INSTALL_PREFIX=$(DESTDIR)
INSTALL_BASE=/usr
+libdir?=$(INSTALL_BASE)/lib
SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
LDCONFIG = /sbin/ldconfig
ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
@@ -96,27 +97,27 @@
fi
install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
- 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 libpri.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 libpri.so.$(SONAME) libpri.so)
- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- 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 libpri.so.$(SONAME) libpri.so)
+ install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+ if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
else
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.$(SONAME) libpri.so)
- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
+ install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
+ ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
+ install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
endif
uninstall:
@echo "Removing Libpri"
- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.$(SONAME)
- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so
- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.a
+ rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
+ rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
+ rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
pritest: pritest.o
More information about the libpri-commits
mailing list