[svn-commits] mattf: trunk r22 - /trunk/Makefile

[svn-commits at lists.digium.com]

Author: mattf
Date: Fri Aug 18 17:30:18 2006
New Revision: 22

URL: http://svn.digium.com/view/libss7?rev=22&view=rev
Log:
Update to build on x86-64 correctly (#7750)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/libss7/trunk/Makefile?rev=22&r1=21&r2=22&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Aug 18 17:30:18 2006
@@ -4,6 +4,7 @@
 
 INSTALL_PREFIX?=
 INSTALL_BASE=/usr
+libdir?=$(INSTALL_BASE)/lib
 STATIC_OBJS=mtp2.o ss7_sched.o ss7.o mtp3.o isup.o
 DYNAMIC_OBJS=mtp2.o ss7_sched.o ss7.o mtp3.o isup.o
 STATIC_LIBRARY=libss7.a
@@ -24,13 +25,13 @@
 	rm -f .depend
 
 install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
-	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+	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)$(INSTALL_BASE)/lib
-	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libss7.so.1 libss7.so ; $(SOSLINK) )
-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libss7.so.1 libss7.so ; $(SOSLINK) )
+	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
 
 	if test $$(id -u) = 0; then $(LDCONFIG); fi