OpenIPMIpthread.pc.in |    4 ++--

 OpenIPMIui.pc.in      |    2 +-

 configure.in          |    2 +-

 ipmi.init             |   13 ++++---------

 swig/perl/Makefile.am |    4 ++--

 ui/Makefile.am        |    2 +-

 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/OpenIPMIpthread.pc.in b/OpenIPMIpthread.pc.in

index 59b52e5..34b2f29 100644

--- a/OpenIPMIpthread.pc.in

+++ b/OpenIPMIpthread.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@

 Name: OpenIPMIpthread

 Description: Pthread OS handler for OpenIPMI

 Version: @VERSION@

-Requires: OpenIPMI pthread

-Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread

+Requires: OpenIPMI

+Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread -lpthread

 Cflags: -I${includedir}

diff --git a/OpenIPMIui.pc.in b/OpenIPMIui.pc.in

index 55fd66a..f5b28f2 100644

--- a/OpenIPMIui.pc.in

+++ b/OpenIPMIui.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@

 Name: OpenIPMIui

 Description: UI front-end for OpenIPMI

 Version: @VERSION@

-Requires: OpenIPMI ncurses

+Requires: OpenIPMI

 Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIui -lOpenIPMI -lncurses

 Cflags: -I${includedir}

diff --git a/configure.in b/configure.in

index 663511c..d12d325 100644

--- a/configure.in

+++ b/configure.in

@@ -602,7 +602,7 @@ if test "x$pythoncflags" = "x" -o "x$pythoninstalldir" = "x"; then

    if test "x$pythonprog" != "x"; then

       # Now find a proper installation location.

       if test "x$pythoninstalldir" = "x"; then

-	 pythoninstalldir=`$pythonprog -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib();'`

+	 pythoninstalldir=`$pythonprog -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1);'`

 	 if test "x$pythoninstalldir" = "x" -o ! -d "$pythoninstalldir"; then

 	    pythoninstalldir=

 	 fi

diff --git a/ipmi.init b/ipmi.init

index 812654a..f47bd0d 100644

--- a/ipmi.init

+++ b/ipmi.init

@@ -30,13 +30,8 @@

 #

 #############################################################################

-# for log_success_msg and friends

-if [ -r /lib/lsb/init-functions ]; then

-# LSB, SLES, ...

-    . /lib/lsb/init-functions

-elif [ -r /etc/init.d/functions ]; then

-# Red Hat / VMware

-    . /etc/init.d/functions

+. /etc/init.d/functions

+

     my_log_message()

     {

 	ACTION=$1

@@ -74,7 +69,6 @@ elif [ -r /etc/init.d/functions ]; then

     {

 	my_log_message warning "$*"

     }

-fi

 CONFIGFILE=/etc/sysconfig/ipmi

 # source config info

@@ -210,7 +204,8 @@ start_watchdog_common()

 		log_failure_msg "/dev/watchdog already exists "

 		RETVAL=$((RETVAL | 8))

 		return

-	fi	load_hw_modules

+	fi

+	load_hw_modules

 	modprobe ipmi_watchdog ${IPMI_WATCHDOG_OPTIONS} > /dev/null 2>&1

 	modules_loaded ipmi_watchdog

 	[ ${OnePlusUnloaded} -ne 0 ] &&

diff --git a/swig/perl/Makefile.am b/swig/perl/Makefile.am

index 53fffb6..d5b308f 100644

--- a/swig/perl/Makefile.am

+++ b/swig/perl/Makefile.am

@@ -20,8 +20,8 @@ OpenIPMI_SRC = OpenIPMI_perl.c

 OpenIPMI_OBJ = OpenIPMI_wrap.lo OpenIPMI_perl.lo

 OpenIPMI.so: $(OpenIPMI_OBJ)

-	$(LIBTOOL) --mode=link $(CC) -shared -module -avoid-version -o $(@:.so=.la) $^ $(OPENIPMI_SWIG_LIBS) $(PERL_POSIX_LIB) -rpath $(PERL_INSTALL_DIR)/auto/OpenIPMI

-	rm -f OpenIPMI.so

+	$(LIBTOOL) --mode=link $(CC) --shared -module -avoid-version -o $@ $^ -L$(libdir)/perl5/CORE -lperl $(OPENIPMI_SWIG_LIBS)

+	rm OpenIPMI.so

 	mv .libs/OpenIPMI.so .

 	rm -rf .libs

diff --git a/ui/Makefile.am b/ui/Makefile.am

index fc9a389..50ba95e 100644

--- a/ui/Makefile.am

+++ b/ui/Makefile.am

@@ -22,7 +22,7 @@ LD_VERSION = $(VERSION_CURRENT):$(VERSION_REVISION):$(VERSION_AGE)

 lib_LTLIBRARIES = libOpenIPMIui.la

 libOpenIPMIui_la_SOURCES = ui.c ui_os.c ui_keypad.c ui_command.c 

-libOpenIPMIui_la_LIBADD =

+libOpenIPMIui_la_LIBADD = $(top_builddir)/lib/libOpenIPMI.la $(top_builddir)/unix/libOpenIPMIposix.la

 libOpenIPMIui_la_LDFLAGS = -version-info $(LD_VERSION) \

 	-Wl,-Map -Wl,libOpenIPMIui.map