Imported Upstream version 2.9.8upstream/2.9.8

4 files changed, 27 insertions, 21 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 78d967d..e32afa5 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -47,12 +47,12 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -101,7 +101,7 @@ LIB_DIR = /usr/lib64
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
@@ -115,9 +115,9 @@ OTOOL64 =
 PACKAGE = ipmiutil
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 2.9.7
+PACKAGE_STRING = ipmiutil 2.9.8
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.7
+PACKAGE_VERSION = 2.9.8
 PATH_SEPARATOR = :
 PKG_DIR = /root/rpmbuild
 RANLIB = ranlib
@@ -129,11 +129,11 @@ SHR_LINK = libipmiutil.so.1
 STRIP = strip
 SUBDIR_S = doc scripts lib util
 SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 2.9.7
-abs_builddir = /usr/dev/ipmiutil-2.9.7/lib
-abs_srcdir = /usr/dev/ipmiutil-2.9.7/lib
-abs_top_builddir = /usr/dev/ipmiutil-2.9.7
-abs_top_srcdir = /usr/dev/ipmiutil-2.9.7
+VERSION = 2.9.8
+abs_builddir = /usr/dev/ipmiutil-2.9.8/lib
+abs_srcdir = /usr/dev/ipmiutil-2.9.8/lib
+abs_top_builddir = /usr/dev/ipmiutil-2.9.8
+abs_top_srcdir = /usr/dev/ipmiutil-2.9.8
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
 am__include = include
@@ -161,7 +161,7 @@ host_vendor = redhat
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.7/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.8/install-sh
 libdir = $(iprefix)/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -410,8 +410,10 @@ distclean:
 	cd lanplus; make distclean
 
 install:
-	$(MKDIR) ${datato}
-	cd lanplus; make install
+	if [ "$(PLUSFLAGS)" = "-DHAVE_LANPLUS" ]; then \
+	   $(MKDIR) ${datato} ; \
+	   cd lanplus; make install ; \
+	fi
 
 check:
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 805a218..16400f2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -51,8 +51,10 @@ distclean:
 	cd lanplus; make distclean
 	
 install:
-	$(MKDIR) ${datato}
-	cd lanplus; make install
+	if [ "$(PLUSFLAGS)" = "-DHAVE_LANPLUS" ]; then \
+	   $(MKDIR) ${datato} ; \
+	   cd lanplus; make install ; \
+	fi
 
 check:
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3bcfeda..a203723 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -410,8 +410,10 @@ distclean:
 	cd lanplus; make distclean
 
 install:
-	$(MKDIR) ${datato}
-	cd lanplus; make install
+	if [ "$(PLUSFLAGS)" = "-DHAVE_LANPLUS" ]; then \
+	   $(MKDIR) ${datato} ; \
+	   cd lanplus; make install ; \
+	fi
 
 check:
 
diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc
index a952285..b6e9013 100644
--- a/lib/libipmiutil.pc
+++ b/lib/libipmiutil.pc
@@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@
 
 Name: libipmiutil
 Description: Library for ipmiutil
-Version: 2.9.7
+Version: 2.9.8
 Libs: -L${libdir} -lipmi_lanplus
 Cflags: -I${includedir}