diff -uNr libpri-1.4.9.ORIG/Makefile libpri-1.4.9/Makefile --- libpri-1.4.9.ORIG/Makefile 2009-03-10 18:08:07.000000000 +0000 +++ libpri-1.4.9/Makefile 2009-03-10 18:11:24.000000000 +0000 @@ -46,7 +46,7 @@ CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) INSTALL_PREFIX=$(DESTDIR) INSTALL_BASE=/usr -libdir?=$(INSTALL_BASE)/lib +LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY) LDCONFIG = /sbin/ldconfig ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX)) @@ -89,27 +89,27 @@ fi install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) - mkdir -p $(INSTALL_PREFIX)$(libdir) + 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)$(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 + 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.$(SONAME) libpri.so) + 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)$(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) + install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY) + ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so) + install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY) endif uninstall: @echo "Removing Libpri" - rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME) - rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so - rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a + rm -f $(LIBDIR)/libpri.so.$(SONAME) + rm -f $(LIBDIR)/libpri.so + rm -f $(LIBDIR)/libpri.a rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h pritest: pritest.o