diff -Nru libpri-1.2.5.orig/Makefile libpri-1.2.5/Makefile --- libpri-1.2.5.orig/Makefile 2007-08-06 22:04:41.000000000 +0200 +++ libpri-1.2.5/Makefile 2007-08-06 22:02:37.000000000 +0200 @@ -41,6 +41,7 @@ CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) INSTALL_PREFIX=$(DESTDIR) INSTALL_BASE=/usr +LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib SOFLAGS = -Wl,-hlibpri.so.1.0 LDCONFIG = /sbin/ldconfig ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD)) @@ -73,28 +74,28 @@ fi install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) - mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib + mkdir -p $(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.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) $(LIBDIR) + if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi + ( cd $(LIBDIR) ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 ) + install -m 644 $(STATIC_LIBRARY) $(LIBDIR) + if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(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.1.0 libpri.so ; $(SOSLINK) ) - install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY) + install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY) + ( cd $(LIBDIR) ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) ) + install -f $(LIBDIR) -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 $(LIBDIR)/libpri.so.1.0 + rm -f $(LIBDIR)/libpri.so.1 + rm -f $(LIBDIR)/libpri.so + rm -f $(LIBDIR)/libpri.a rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h pritest: pritest.o