| @@ -0,0 +1,63 @@
+--- Makefile
++++ Makefile
+@@ -48,6 +48,7 @@
+ CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
++LIB=lib
+ SOFLAGS = -Wl,-hlibpri.so.1.0
+ LDCONFIG = /sbin/ldconfig
+ ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
+@@ -88,28 +89,28 @@
+ fi
+
+ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
++ mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB)
+ 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 restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
+- 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)$(INSTALL_BASE)/$(LIB)
++ if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB)/$(DYNAMIC_LIBRARY); fi
++ ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB) ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
++ 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
+ 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.1.0 libpri.so ; $(SOSLINK) )
+- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
++ install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB) -m 755 $(DYNAMIC_LIBRARY)
++ ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB) ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
++ install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB) -m 644 $(STATIC_LIBRARY)
+ endif
+
+ uninstall:
+ @echo "Removing Libpri"
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1.0
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.a
++ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB)/libpri.so.1.0
++ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB)/libpri.so.1
++ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB)/libpri.so
++ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/$(LIB)/libpri.a
+ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
+
+ pritest: pritest.o
+--- q921.c
++++ q921.c
+@@ -1558,7 +1558,7 @@
+ /* Reset and restart t203 timer */
+ if (pri->t203_timer[teio])
+ pri_schedule_del(pri, pri->t203_timer[teio]);
+- pri->t203_timer[teio] = pri_schedule_event2(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri, tei);
++ pri->t203_timer[teio] = pri_schedule_event2(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri, h->h.tei);
+ pri->solicitfbit[teio] = 0;
+ }
+ } else {
|
