diff -r -u /tmp/ibutils-1.5.7/config/osm.m4 ibutils-1.5.7/config/osm.m4

--- /tmp/ibutils-1.5.7/config/osm.m4	Thu Feb 18 03:31:34 2010

+++ ibutils-1.5.7/config/osm.m4	Thu Feb 24 16:51:16 2011

@@ -179,7 +179,7 @@

       osm_debug_flags=

    fi

-   OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1"

+   OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1"

 else

    dnl dummy values

    with_osm=disabled

diff -r -u /tmp/ibutils-1.5.7/ibdiag/doc/ibdiagnet.pod ibutils-1.5.7/ibdiag/doc/ibdiagnet.pod

--- /tmp/ibutils-1.5.7/ibdiag/doc/ibdiagnet.pod	Mon Nov  1 16:03:43 2010

+++ ibutils-1.5.7/ibdiag/doc/ibdiagnet.pod	Thu Jun  2 12:30:13 2011

@@ -122,7 +122,6 @@

 =over

-=item

 Min number of packets to be sent across each link (default = 10)

 =back

@@ -131,7 +130,6 @@

 =over

-=item

 Enable verbose mode

 =back

@@ -140,7 +138,6 @@

 =over

-=item

 Provides a report of the fabric qualities

 =back

@@ -149,7 +146,6 @@

 =over

-=item

 Credit loop check based on UpDown rules

 =back

@@ -158,7 +154,6 @@

 =over

-=item

 Specifies the topology file name

 =back

@@ -167,7 +162,6 @@

 =over

-=item

 Specifies the local system name. Meaningful only if a topology file is specified

 =back

@@ -176,7 +170,6 @@

 =over

-=item

 Specifies the index of the device of the port used to connect to the IB fabric (in case of multiple devices on the local system)

 =back

@@ -185,7 +178,6 @@

 =over

-=item

 Specifies the local device's port num used to connect to the IB fabric

 =back

@@ -194,7 +186,6 @@

 =over

-=item

 Specifies the directory where the output files will be placed (default = /tmp)

 =back

@@ -203,7 +194,6 @@

 =over

-=item

 Specifies the expected link width

 =back

@@ -212,7 +202,6 @@

 =over

-=item

 Specifies the expected link speed

 =back

@@ -221,7 +210,6 @@

 =over

-=item

 Dump all the fabric links, pm Counters into ibdiagnet.pm

 =back

@@ -230,7 +218,6 @@

 =over

-=item

 Reset all the fabric links pmCounters

 =back

@@ -239,7 +226,6 @@

 =over

-=item

 If any of the provided pm is greater then its provided value, print it to screen

 =back

@@ -248,7 +234,6 @@

 =over

-=item

 Skip the executions of the selected checks.

 Skip options (one or more can be specified) : dup_guids  zero_guids pm logical_state part ipoib all

@@ -258,7 +243,6 @@

 =over

-=item

 Write out the discovered topology into the given file. This flag is useful if you later want to check for changes from the current state of the fabric.

 A directory named ibdiag_ibnl is also created by this option, and holds the IBNL files required to load this topology. To use these files you will need to set the environment variable named IBDM_IBNL_PATH to that directory. The directory is located in /tmp or in the output directory provided by the -o flag.

@@ -268,7 +252,6 @@

 =over

-=item

 Load subnet data from the given .db file, and skip subnet discovery stage.

 Note: Some of the checks require actual subnet discovery, and therefore would not run when load_db is specified. These checks are

 : Duplicated/zero guids, link state, SMs status.

@@ -279,7 +262,6 @@

 =over

-=item

 VL based Routing - provide this option to create the paths SL file (psl), SL2VL file (slvl)

 and use them in credit loops check (if -r option is provided).

@@ -291,7 +273,6 @@

 =over

-=item

 Prints the help page information

 =back

@@ -300,7 +281,6 @@

 =over

-=item

 Prints the version of the tool

 =back

@@ -309,7 +289,6 @@

 =over

-=item

 Prints the tool's environment variables and their values

 =back

diff -r -u /tmp/ibutils-1.5.7/ibdiag/doc/Makefile.in ibutils-1.5.7/ibdiag/doc/Makefile.in

--- /tmp/ibutils-1.5.7/ibdiag/doc/Makefile.in	Tue Mar  8 03:09:32 2011

+++ ibutils-1.5.7/ibdiag/doc/Makefile.in	Thu Feb 24 16:51:16 2011

@@ -52,7 +52,7 @@

 pkglibdir = $(libdir)/@PACKAGE@

 pkglibexecdir = $(libexecdir)/@PACKAGE@

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-install_sh_DATA = $(install_sh) -c -m 644

+install_sh_DATA = $(install_sh) -c -m 744

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

 INSTALL_HEADER = $(INSTALL_DATA)

diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/ibdebug.tcl ibutils-1.5.7/ibdiag/src/ibdebug.tcl

--- /tmp/ibutils-1.5.7/ibdiag/src/ibdebug.tcl	Tue Mar  8 03:08:02 2011

+++ ibutils-1.5.7/ibdiag/src/ibdebug.tcl	Thu Jun 27 22:46:57 2013

@@ -352,13 +352,16 @@

     if {[file exists $ibisOutDir/$ibisLogFile] && (![file writable $ibisOutDir/$ibisLogFile])} {

 	set ibisLogFile $ibisLogFile.[pid]

     }

+

+    ## Check if the file exists. If it does delete it. The log file is opened with the 'w' access

+    ## mode which truncates the file to zero length, so the contents are not preserved. Deleting

+    ## the file prevents any softlink based system file clobbering issues.

     if {[file exists $ibisOutDir/$ibisLogFile]} {

-	if {![file writable $ibisOutDir/$ibisLogFile]} {

-	    if {![file writable $ibisOutDir/$ibisLogFile]} {

-		catch {set ibisLogFd [open $ibisOutDir/$ibisLogFile w]} errMsg

-		inform "-E-ibis:file.not.writable" -value $ibisOutDir/$ibisLogFile -errMsg $errMsg

-	    }

-	}

+        ## Since we have already verified the directory is writable and open with 'w' option

+        ## truncates the file, it is safe to delete the file if it exists.

+        if {[catch {file delete $ibisOutDir/$ibisLogFile} errMsg]} {

+            inform "-E-ibis:could.not.delete.file" -value $ibisOutDir/$ibisLogFile

+        }

     }

     inform "-V-ibis.ibis.log.file" -value $ibisOutDir/$ibisLogFile

@@ -5123,6 +5126,16 @@

         return 1

     }

+    ## If the file exists delete the file to prevent any symlink

+    ## system file clobbering. The file is about to be opened with

+    ## the access mode of 'w', which will truncate the file to zero

+    ## length anyway. So, it is safe to delete the file now.

+    if {[file exists $G(outfiles,.db)]} {

+        if {[catch {file delete $G(outfiles,.db)} errMsg]} {

+           return 1

+        }

+    }

+

     set FileID [InitializeOutputFile $G(var:tool.name).db]

     foreach {array_name data} {G data* Neighbor *} {

diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl

--- /tmp/ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl	Thu Oct  7 07:29:56 2010

+++ ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl	Wed Jun 19 07:43:17 2013

@@ -675,6 +675,16 @@

     }

     ## Command line check - Test5.0: log file

+

+    ## The directory has been verified to be writable, delete the file if it exists since

+    ## we anyway open it with 'w' which will truncate it to zero length. Deleting the file

+    ## will prevent symlink based system file clobbering.

+    if {[file exists $G(outfiles,.log)]} {

+        if {[catch {file delete $G(outfiles,.log)} errMsg]} {

+            ## Print the delete failure error message and exit

+            inform "-E-loading:cannot.delete.file" $G(outfiles,.log) -fn $G(outfiles,.log) -errMsg $errMsg

+        }

+    }

     if {[catch {set G(logFileID) [open $G(outfiles,.log) w]} errMsg]} {

 	 inform "-E-loading:cannot.open.file" $G(outfiles,.log) -fn $G(outfiles,.log) -errMsg $errMsg

     }

@@ -1229,6 +1239,10 @@

 	    append msgText "IBIS: The following file is write protected: $msgF(value)%n"

 	    append msgText "Error message: \"$msgF(errMsg)\""

 	}

+	"-E-ibis:could.not.delete.file" {

+	    append msgText "IBIS: Could not delete the file : $msgF(value)%n"

+	    append msgText "Error message: \"$msgF(errMsg)\""

+	}

 	"-V-ibis:ibis_get_local_ports_info" {

 	    append msgText "IBIS: ibis_get_local_ports_info:%n$msgF(value)"

 	}

@@ -1260,6 +1274,10 @@

 	    append msgText "Failed to load ibdiag external DB from: $msgF(fn)%n"

 	    append msgText "Error message: \"$msgF(errMsg)\""

 	}

+	"-E-loading:cannot.delete.file" {

+	    append msgText "Could not delete the file : $msgF(fn)%n"

+	    append msgText "Error message: \"$msgF(errMsg)\""

+	}

         "-W-loading:old.osm.version" {

 	    append msgText "OSM: The current OSM version is not up-to-date"

 	}

diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/Makefile.in ibutils-1.5.7/ibdiag/src/Makefile.in

--- /tmp/ibutils-1.5.7/ibdiag/src/Makefile.in	Tue Mar  8 03:09:32 2011

+++ ibutils-1.5.7/ibdiag/src/Makefile.in	Thu Feb 24 16:51:16 2011

@@ -53,7 +53,7 @@

 pkglibdir = $(libdir)/@PACKAGE@

 pkglibexecdir = $(libexecdir)/@PACKAGE@

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-install_sh_DATA = $(install_sh) -c -m 644

+install_sh_DATA = $(install_sh) -c -m 744

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

 INSTALL_HEADER = $(INSTALL_DATA)

@@ -96,7 +96,7 @@

 am__base_list = \

   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

-am__installdirs = "$(DESTDIR)$(bindir)"

+am__installdirs = "$(DESTDIR)$(sbindir)"

 SCRIPTS = $(bin_SCRIPTS)

 SOURCES =

 DIST_SOURCES =

@@ -224,8 +224,8 @@

 $(am__aclocal_m4_deps):

 install-binSCRIPTS: $(bin_SCRIPTS)

 	@$(NORMAL_INSTALL)

-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \

+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"

+	@list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || list=; \

 	for p in $$list; do \

 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \

@@ -243,19 +243,19 @@

 	while read type dir files; do \

 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

 	     test -z "$$files" || { \

-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \

-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \

+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \

+	       $(INSTALL_SCRIPT) -m 755 $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \

 	     } \

 	; done

 uninstall-binSCRIPTS:

 	@$(NORMAL_UNINSTALL)

-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \

+	@list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \

 	files=`for p in $$list; do echo "$$p"; done | \

 	       sed -e 's,.*/,,;$(transform)'`; \

 	test -n "$$list" || exit 0; \

-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \

-	cd "$(DESTDIR)$(bindir)" && rm -f $$files

+	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \

+	cd "$(DESTDIR)$(sbindir)" && rm -f $$files

 tags: TAGS

 TAGS:

@@ -297,7 +297,7 @@

 check: check-am

 all-am: Makefile $(SCRIPTS)

 installdirs:

-	for dir in "$(DESTDIR)$(bindir)"; do \

+	for dir in "$(DESTDIR)$(sbindir)"; do \

 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \

 	done

 install: install-am

@@ -426,6 +426,7 @@

 	sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \

 	    -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \

 	    -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \

+	    -e 's=%with_ibis_sbindir%='$(DESTDIR)$(sbindir)'=' \

 	    -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagnet.in > ibdiagnet

 ibdiagpath: ibdiagpath.in

@@ -432,6 +433,7 @@

 	sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \

 	    -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \

 	    -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \

+	    -e 's=%with_ibis_sbindir%='$(DESTDIR)$(sbindir)'=' \

 	    -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagpath.in > ibdiagpath

 ibdiagui: ibdiagui.in

@@ -440,6 +442,7 @@

 	    -e 's=%with_tk_lib%='$(with_tk_lib)'=' \

 	    -e 's=%with_graphviz_lib%='$(with_graphviz_lib)'=' \

 	    -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \

+	    -e 's=%with_ibis_sbindir%='$(DESTDIR)$(sbindir)'=' \

 	    -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagui.in > ibdiagui

 clean:

diff -r -u /tmp/ibutils-1.5.7/ibdiag/Makefile.in ibutils-1.5.7/ibdiag/Makefile.in

--- /tmp/ibutils-1.5.7/ibdiag/Makefile.in	Tue Mar  8 03:09:32 2011

+++ ibutils-1.5.7/ibdiag/Makefile.in	Thu Feb 24 16:51:16 2011

@@ -54,7 +54,7 @@

 pkglibdir = $(libdir)/@PACKAGE@

 pkglibexecdir = $(libexecdir)/@PACKAGE@

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-install_sh_DATA = $(install_sh) -c -m 644

+install_sh_DATA = $(install_sh) -c -m 744

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

 INSTALL_HEADER = $(INSTALL_DATA)

diff -r -u /tmp/ibutils-1.5.7/ibdiag/configure ibutils-1.5.7/ibdiag/configure

--- /tmp/ibutils-1.5.7/ibdiag/configure	Tue Mar  8 03:09:33 2011

+++ ibutils-1.5.7/ibdiag/configure	Thu Mar 10 18:33:24 2011

@@ -1811,7 +1811,7 @@

 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'

-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744'

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5

 $as_echo_n "checking whether build environment is sane... " >&6; }

diff -r -u /tmp/ibutils-1.5.7/ibdm/Clusters/Makefile.in ibutils-1.5.7/ibdm/Clusters/Makefile.in

--- /tmp/ibutils-1.5.7/ibdm/Clusters/Makefile.in	Tue Mar  8 03:09:40 2011

+++ ibutils-1.5.7/ibdm/Clusters/Makefile.in	Thu Feb 24 16:51:16 2011

@@ -53,7 +53,7 @@

 pkglibdir = $(libdir)/@PACKAGE@

 pkglibexecdir = $(libexecdir)/@PACKAGE@

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-install_sh_DATA = $(install_sh) -c -m 644

+install_sh_DATA = $(install_sh) -c -m 744

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

 INSTALL_HEADER = $(INSTALL_DATA)

diff -r -u /tmp/ibutils-1.5.7/ibdm/aclocal.m4 ibutils-1.5.7/ibdm/aclocal.m4

--- /tmp/ibutils-1.5.7/ibdm/aclocal.m4	Tue Mar  8 03:09:38 2011

+++ ibutils-1.5.7/ibdm/aclocal.m4	Thu Feb 24 16:51:16 2011

@@ -1389,7 +1389,7 @@

 # Determine commands to create old-style static archives.

 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'

-old_postinstall_cmds='chmod 644 $oldlib'

+old_postinstall_cmds='chmod 744 $oldlib'

 old_postuninstall_cmds=

 if test -n "$RANLIB"; then

@@ -2610,6 +2610,23 @@

   hardcode_into_libs=yes

   # ldd complains unless libraries are executable

   postinstall_cmds='chmod +x $lib'

+  if echo "$CFLAGS" | grep '\-m64' >/dev/null ; then

+    sys_lib_search_path_spec=`$CC -m64 -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

+

+    solaris_arch=`uname -p`

+    if [ $solaris_arch = "i386" ]; then

+      lib64=amd64

+    else

+      lib64=sparcv9

+    fi

+

+    if ! echo "$sys_lib_search_path_spec" | grep $lib64 >/dev/null  ; then

+      solaris_lib64path=`echo "$sys_lib_search_path_spec" | $SED  -e "s/ /$lib64\/ /g" | cut -d " " -f2-`

+      solaris_lib64path="$solaris_lib64path""$lib64"/

+      sys_lib_search_path_spec="$solaris_lib64path $sys_lib_search_path_spec"

+    fi

+  fi

   ;;

 sunos4*)

diff -r -u /tmp/ibutils-1.5.7/ibdm/doc/Makefile.in ibutils-1.5.7/ibdm/doc/Makefile.in

--- /tmp/ibutils-1.5.7/ibdm/doc/Makefile.in	Tue Mar  8 03:09:41 2011

+++ ibutils-1.5.7/ibdm/doc/Makefile.in	Thu Feb 24 16:51:17 2011

@@ -52,7 +52,7 @@

 pkglibdir = $(libdir)/@PACKAGE@

 pkglibexecdir = $(libexecdir)/@PACKAGE@

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-install_sh_DATA = $(install_sh) -c -m 644

+install_sh_DATA = $(install_sh) -c -m 744

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

 INSTALL_HEADER = $(INSTALL_DATA)

diff -r -u /tmp/ibutils-1.5.7/ibdm/ibnl/Makefile.in ibutils-1.5.7/ibdm/ibnl/Makefile.in

--- /tmp/ibutils-1.5.7/ibdm/ibnl/Makefile.in	Tue Mar  8 03:09:41 2011

+++ ibutils-1.5.7/ibdm/ibnl/Makefile.in	Thu Feb 24 16:51:17 2011

@@ -53,7 +53,7 @@

 pkglibdir = $(libdir)/@PACKAGE@

 pkglibexecdir = $(libexecdir)/@PACKAGE@

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-install_sh_DATA = $(install_sh) -c -m 644

+install_sh_DATA = $(install_sh) -c -m 744

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

 INSTALL_HEADER = $(INSTALL_DATA)

diff -r -u /tmp/ibutils-1.5.7/ibdm/src/Makefile.in ibutils-1.5.7/ibdm/src/Makefile.in

--- /tmp/ibutils-1.5.7/ibdm/src/Makefile.in	Tue Mar  8 03:09:41 2011

+++ ibutils-1.5.7/ibdm/src/Makefile.in	Thu Feb 24 16:51:17 2011

@@ -57,7 +57,7 @@

 pkglibdir = $(libdir)/@PACKAGE@

 pkglibexecdir = $(libexecdir)/@PACKAGE@

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-install_sh_DATA = $(install_sh) -c -m 644

+install_sh_DATA = $(install_sh) -c -m 744

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

 INSTALL_HEADER = $(INSTALL_DATA)

@@ -105,7 +105,7 @@

 am__base_list = \

   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \

+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \

 	"$(DESTDIR)$(pkgincludedir)"

 LTLIBRARIES = $(lib_LTLIBRARIES)

 libibsysapi_la_DEPENDENCIES =

@@ -369,8 +369,8 @@

 	$(libibsysapi_la_LINK) -rpath $(libdir) $(libibsysapi_la_OBJECTS) $(libibsysapi_la_LIBADD) $(LIBS)

 install-binPROGRAMS: $(bin_PROGRAMS)

 	@$(NORMAL_INSTALL)

-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"

+	@list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \

 	for p in $$list; do echo "$$p $$p"; done | \

 	sed 's/$(EXEEXT)$$//' | \

 	while read p p1; do if test -f $$p || test -f $$p1; \

@@ -387,20 +387,20 @@

 	while read type dir files; do \

 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

 	    test -z "$$files" || { \

-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \

-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \

+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \

+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \

 	    } \

 	; done

 uninstall-binPROGRAMS:

 	@$(NORMAL_UNINSTALL)

-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

+	@list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \

 	files=`for p in $$list; do echo "$$p"; done | \

 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \

 	      -e 's/$$/$(EXEEXT)/' `; \

 	test -n "$$list" || exit 0; \

-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \

-	cd "$(DESTDIR)$(bindir)" && rm -f $$files

+	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \

+	cd "$(DESTDIR)$(sbindir)" && rm -f $$files

 clean-binPROGRAMS: