Sophie

Sophie

distrib > Altlinux > 4.1 > i586 > media > core-src > by-pkgid > 8b93ea2143428ab99d4353b0d8c046dd > files > 2

amanda-2.5.2-alt1.src.rpm

 amandad-src/Makefile.am         |   12 +------
 amandad-src/Makefile.in         |   15 ++-------
 amplot/Makefile.am              |   20 -------------
 amplot/Makefile.in              |   29 +-----------------
 amplot/amplot.g                 |    2 +-
 changer-src/Makefile.am         |   18 -----------
 changer-src/Makefile.in         |   22 +-------------
 changer-src/chg-juke.sh.in      |    4 +-
 changer-src/chg-multi.sh.in     |    4 +-
 client-src/Makefile.am          |   33 +--------------------
 client-src/Makefile.in          |   51 +++++++-------------------------
 client-src/sendbackup-gnutar.c  |    2 +
 configure                       |   26 ++++++++--------
 configure.in                    |   20 +++---------
 dumper-src/Makefile.am          |   13 --------
 dumper-src/Makefile.in          |   28 ++++-------------
 dumper-src/generic-dumper.pl.in |    9 ++++--
 man/Makefile.am                 |   16 ----------
 man/Makefile.in                 |   16 ----------
 oldrecover-src/Makefile.am      |   13 --------
 oldrecover-src/Makefile.in      |   14 +--------
 recover-src/Makefile.am         |   13 --------
 recover-src/Makefile.in         |   18 +----------
 restore-src/Makefile.am         |   18 -----------
 restore-src/Makefile.in         |   22 +-------------
 server-src/Makefile.am          |   46 +----------------------------
 server-src/Makefile.in          |   61 ++++++---------------------------------
 server-src/taper.c              |    4 +-
 tape-src/Makefile.am            |   20 +-----------
 tape-src/Makefile.in            |   29 +++---------------
 30 files changed, 83 insertions(+), 515 deletions(-)

diff --git a/amandad-src/Makefile.am b/amandad-src/Makefile.am
index a673cb5..fc0ef6d 100644
--- a/amandad-src/Makefile.am
+++ b/amandad-src/Makefile.am
@@ -21,6 +21,8 @@ libamandad_la_LDFLAGS = -release $(VERSION)
 
 noinst_HEADERS  = amandad.h
 
+libamandad_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
+
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
 # libraries, and because of the way libtool sets up the command line, we
@@ -33,16 +35,6 @@ LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION) \
 	../gnulib/libgnu.$(LIB_EXTENSION)
 
-install-exec-hook:
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS); do					\
 		f="$$p.c $(libamandad_la_SOURCES)";				\
diff --git a/amandad-src/Makefile.in b/amandad-src/Makefile.in
index 9ea0a5c..347f931 100644
--- a/amandad-src/Makefile.in
+++ b/amandad-src/Makefile.in
@@ -97,7 +97,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libamandad_la_LIBADD =
+libamandad_la_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)
 am_libamandad_la_OBJECTS = amandad_util.lo
 libamandad_la_OBJECTS = $(am_libamandad_la_OBJECTS)
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -385,6 +385,7 @@ LIB_EXTENSION = la
 libamandad_la_SOURCES = amandad_util.c
 libamandad_la_LDFLAGS = -release $(VERSION)
 noinst_HEADERS = amandad.h
+libamandad_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
 
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
@@ -696,7 +697,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-exec-hook \
+	install-data-am install-exec install-exec-am \
 	install-info install-info-am install-libLTLIBRARIES \
 	install-libexecPROGRAMS install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
@@ -706,16 +707,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS
 
 
-install-exec-hook:
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS); do					\
 		f="$$p.c $(libamandad_la_SOURCES)";				\
diff --git a/amplot/Makefile.am b/amplot/Makefile.am
index 7723ed9..dcb711b 100644
--- a/amplot/Makefile.am
+++ b/amplot/Makefile.am
@@ -22,23 +22,3 @@ amplot.gp:		amplot.g
 			echo "pause -1;" >> amplot.gp.new
 			rm -f amplot.gp
 			mv amplot.gp.new amplot.gp
-
-install-exec-hook:
-	@list="$(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
-install-data-hook:
-	@list="$(amplot_DATA)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/$$p; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-        done
diff --git a/amplot/Makefile.in b/amplot/Makefile.in
index a0c2eda..7fe0a72 100644
--- a/amplot/Makefile.in
+++ b/amplot/Makefile.in
@@ -523,12 +523,8 @@ info: info-am
 info-am:
 
 install-data-am: install-amplotDATA
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am: install-sbinSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
 
@@ -558,9 +554,8 @@ uninstall-am: uninstall-amplotDATA uninstall-info-am \
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-amplotDATA install-data install-data-am \
-	install-data-hook install-exec install-exec-am \
-	install-exec-hook install-info install-info-am install-man \
+	install-amplotDATA install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
 	install-sbinSCRIPTS install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
@@ -577,26 +572,6 @@ amplot.gp:		amplot.g
 			echo "pause -1;" >> amplot.gp.new
 			rm -f amplot.gp
 			mv amplot.gp.new amplot.gp
-
-install-exec-hook:
-	@list="$(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
-install-data-hook:
-	@list="$(amplot_DATA)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/$$p; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-        done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/amplot/amplot.g b/amplot/amplot.g
index 9c5dd91..032fd50 100644
--- a/amplot/amplot.g
+++ b/amplot/amplot.g
@@ -32,7 +32,7 @@
 #	Input: the files specified below on the  plot line
 #	Output: a postscript file 
 #
-set data style lines
+set style data lines
 set xrange [0:210]
 set yrange [0:420]
 set xlabel "Minutes"
diff --git a/changer-src/Makefile.am b/changer-src/Makefile.am
index 7632845..84d5fd4 100644
--- a/changer-src/Makefile.am
+++ b/changer-src/Makefile.am
@@ -65,24 +65,6 @@ EXTRA_DIST = scsi-proto.c
 			cat $< > $@
 			chmod a+x $@
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS) $(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS) $(EXTRA_PROGRAMS); do			\
 		f="$$p.c $(libamandad_la_SOURCES)";				\
diff --git a/changer-src/Makefile.in b/changer-src/Makefile.in
index a161797..38e38f9 100644
--- a/changer-src/Makefile.in
+++ b/changer-src/Makefile.in
@@ -728,8 +728,6 @@ info-am:
 install-data-am:
 
 install-exec-am: install-libexecPROGRAMS install-libexecSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
 
@@ -763,7 +761,7 @@ uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-hook install-info install-info-am \
+	install-exec-am install-info install-info-am \
 	install-libexecPROGRAMS install-libexecSCRIPTS install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
@@ -782,24 +780,6 @@ uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
 			cat $< > $@
 			chmod a+x $@
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS) $(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS) $(EXTRA_PROGRAMS); do			\
 		f="$$p.c $(libamandad_la_SOURCES)";				\
diff --git a/changer-src/chg-juke.sh.in b/changer-src/chg-juke.sh.in
index b894623..32f8a9a 100755
--- a/changer-src/chg-juke.sh.in
+++ b/changer-src/chg-juke.sh.in
@@ -53,9 +53,9 @@ getconf=$sbindir/amgetconf$SUF
 #
 JUKE_DIR=/usr/local
 # Fermilab specific
-if [ -f /usr/local/etc/setups.sh ]
+if [ -f $JUKE_DIR/etc/setups.sh ]
 then
-    . /usr/local/etc/setups.sh
+    . $JUKE_DIR/etc/setups.sh
     setup juke
 fi
 
diff --git a/changer-src/chg-multi.sh.in b/changer-src/chg-multi.sh.in
index 0eea3e9..af32432 100644
--- a/changer-src/chg-multi.sh.in
+++ b/changer-src/chg-multi.sh.in
@@ -325,7 +325,7 @@ then
 		echo $answer
 		exit 2
 	    fi
-	    echo `_ '     -> offline'` "$device"` >> $logfile
+	    echo `_ '     -> offline'` "$device" >> $logfile
 	    $MT $MTF $device offline >> $logfile 2>&1
 	    if [ $? -ne 0 ]; then
 		answer=`_ '%s %s: %s: unable to change to slot %s' "$newslot" "$pname" "$device" "$curslot"`
@@ -404,7 +404,7 @@ if [ $loadslot -eq 1 ]; then	# load the tape from the slot
 	# try to rewind the device
 	device=`awk '$1 == "slot" && $2 == '$curslot' {print $3}' $ourconf 2>/dev/null`
 	if [ "$device" = "" ]; then
-		answer=`_ "%s %s: slot %s device not specified in %s' "$curslot" "$pname" "$curslot" "$ourconf"`
+		answer=`_ '%s %s: slot %s device not specified in %s' "$curslot" "$pname" "$curslot" "$ourconf"`
 		echo `_ 'Exit ->'` $answer >> $logfile
 		echo $answer
 		exit 2
diff --git a/client-src/Makefile.am b/client-src/Makefile.am
index 2aa6d47..c1d91e2 100644
--- a/client-src/Makefile.am
+++ b/client-src/Makefile.am
@@ -31,6 +31,8 @@ libamclient_la_SOURCES=	amandates.c		getfsent.c	\
 
 libamclient_la_LDFLAGS = -release $(VERSION)
 
+libamclient_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
+
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
 # libraries, and because of the way libtool sets up the command line, we
@@ -75,37 +77,6 @@ noinst_HEADERS	= 	amandates.h	getfsent.h	\
 			findpass.h	client_util.h
 			
 
-install-exec-hook:
-	@list="$(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-if WANT_SETUID_CLIENT
-	@list="calcsize killpgrp rundump runtar"; \
-	for p in $$list; do \
-		if echo "$(libexec_PROGRAMS)" | grep $$p >/dev/null 2>&1; then \
-			pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-			echo chown root $$pa; \
-			chown root $$pa; \
-			echo chmod u+s,o-rwx $$pa; \
-			chmod u+s,o-rwx $$pa; \
-		else true; \
-		fi; \
-	done
-endif
-
 lint:
 	@ for p in $(libexec_PROGRAMS); do					\
 		f="$$p.c $(libamclient_la_SOURCES)";				\
diff --git a/client-src/Makefile.in b/client-src/Makefile.in
index b797c1b..f3726de 100644
--- a/client-src/Makefile.in
+++ b/client-src/Makefile.in
@@ -102,7 +102,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libamclient_la_LIBADD =
+libamclient_la_DEPENDENCIES =  \
+	../common-src/libamanda.$(LIB_EXTENSION)
 am__libamclient_la_SOURCES_DIST = amandates.c getfsent.c unctime.c \
 	client_util.c findpass.c
 @WANT_SAMBA_TRUE@am__objects_1 = findpass.lo
@@ -482,6 +483,7 @@ libamclient_la_SOURCES = amandates.c		getfsent.c	\
 			$(samba_sources)
 
 libamclient_la_LDFLAGS = -release $(VERSION)
+libamclient_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
 
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
@@ -859,8 +861,6 @@ install-data-am:
 
 install-exec-am: install-libLTLIBRARIES install-libexecPROGRAMS \
 	install-libexecSCRIPTS install-sbinSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
 
@@ -895,14 +895,14 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-exec-hook \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-libexecPROGRAMS install-libexecSCRIPTS install-man \
-	install-sbinSCRIPTS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-libLTLIBRARIES install-libexecPROGRAMS \
+	install-libexecSCRIPTS install-man install-sbinSCRIPTS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am uninstall-libLTLIBRARIES \
 	uninstall-libexecPROGRAMS uninstall-libexecSCRIPTS \
 	uninstall-sbinSCRIPTS
 
@@ -916,35 +916,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 			cat $< > $@
 			chmod a+x $@
 
-install-exec-hook:
-	@list="$(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-@WANT_SETUID_CLIENT_TRUE@	@list="calcsize killpgrp rundump runtar"; \
-@WANT_SETUID_CLIENT_TRUE@	for p in $$list; do \
-@WANT_SETUID_CLIENT_TRUE@		if echo "$(libexec_PROGRAMS)" | grep $$p >/dev/null 2>&1; then \
-@WANT_SETUID_CLIENT_TRUE@			pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-@WANT_SETUID_CLIENT_TRUE@			echo chown root $$pa; \
-@WANT_SETUID_CLIENT_TRUE@			chown root $$pa; \
-@WANT_SETUID_CLIENT_TRUE@			echo chmod u+s,o-rwx $$pa; \
-@WANT_SETUID_CLIENT_TRUE@			chmod u+s,o-rwx $$pa; \
-@WANT_SETUID_CLIENT_TRUE@		else true; \
-@WANT_SETUID_CLIENT_TRUE@		fi; \
-@WANT_SETUID_CLIENT_TRUE@	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS); do					\
 		f="$$p.c $(libamclient_la_SOURCES)";				\
diff --git a/client-src/sendbackup-gnutar.c b/client-src/sendbackup-gnutar.c
index 0aef9c7..60e6637 100644
--- a/client-src/sendbackup-gnutar.c
+++ b/client-src/sendbackup-gnutar.c
@@ -97,6 +97,8 @@ static amregex_t re_table[] = {
   AM_NORMAL_RE("^load_client_codepage"),
 #endif
 
+   AM_NORMAL_RE(": socket ignored"),
+
 #ifdef IGNORE_SMBCLIENT_ERRORS
   /* This will cause amanda to ignore real errors, but that may be
    * unavoidable when you're backing up system disks.  It seems to be
diff --git a/configure b/configure
index 08704fb..849bc5e 100755
--- a/configure
+++ b/configure
@@ -42509,13 +42509,13 @@ fi
 esac
 
 
-echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
+echo "$as_me:$LINENO: checking for tgetent in -ltinfo" >&5
+echo $ECHO_N "checking for tgetent in -ltinfo... $ECHO_C" >&6
+if test "${ac_cv_lib_tinfo_tgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltermcap  $LIBS"
+LIBS="-ltinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42560,29 +42560,29 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_termcap_tgetent=yes
+  ac_cv_lib_tinfo_tgetent=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_termcap_tgetent=no
+ac_cv_lib_tinfo_tgetent=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
-if test $ac_cv_lib_termcap_tgetent = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgetent" >&5
+echo "${ECHO_T}$ac_cv_lib_tinfo_tgetent" >&6
+if test $ac_cv_lib_tinfo_tgetent = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTERMCAP 1
+#define HAVE_LIBTINFO 1
 _ACEOF
 
-  LIBS="-ltermcap $LIBS"
+  LIBS="-ltinfo $LIBS"
 
 fi
 
-if test "x$ac_cv_lib_termcap_tgetent" != xyes; then
+if test "x$ac_cv_lib_tinfo_tgetent" != xyes; then
 
 echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
 echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
@@ -42734,7 +42734,7 @@ fi
 
     fi
 fi
-if test "x$ac_cv_lib_termcap_tgetent" = xyes ||
+if test "x$ac_cv_lib_tinfo_tgetent" = xyes ||
    test "x$ac_cv_lib_curses_tgetent" = xyes ||
    test "x$ac_cv_lib_ncurses_tgetent" = xyes; then
 
diff --git a/configure.in b/configure.in
index a15742a..0db8fdd 100644
--- a/configure.in
+++ b/configure.in
@@ -1633,18 +1633,8 @@ fi
 
 AC_PATH_PROGS(SAMBA_CLIENT,smbclient,,$LOCSYSPATH)
 if test ! -z "$SAMBA_CLIENT"; then
-  case "`\"$SAMBA_CLIENT\" '\\\\not.a.host.name\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in
-  *"Unknown host"*)
-		smbversion=1
-		;;
-  *"Connection to not.a.host.name failed"*)
-		smbversion=2
-		;;
-  *)
-		AC_MSG_WARN([*** $SAMBA_CLIENT does not seem to be smbclient, so it will not be used.])
-		SAMBA_CLIENT=
-		;;
-  esac
+  # don't check for sbmclient version, assume 2 instead
+  smbversion=2
   if test -n "$SAMBA_CLIENT"; then
     AC_DEFINE_UNQUOTED(SAMBA_CLIENT,"$SAMBA_CLIENT",[Define the location of smbclient for backing up Samba PC clients. ])
     AC_DEFINE_UNQUOTED(SAMBA_VERSION, $smbversion,
@@ -2357,14 +2347,14 @@ case "$target" in
 			;;
 esac
 
-AC_CHECK_LIB(termcap,tgetent)
-if test "x$ac_cv_lib_termcap_tgetent" != xyes; then
+AC_CHECK_LIB(tinfo,tgetent)
+if test "x$ac_cv_lib_tinfo_tgetent" != xyes; then
     AC_CHECK_LIB(curses,tgetent)
     if test "x$ac_cv_lib_curses_tgetent" != xyes; then
 	AC_CHECK_LIB(ncurses,tgetent)
     fi
 fi
-if test "x$ac_cv_lib_termcap_tgetent" = xyes ||
+if test "x$ac_cv_lib_tinfo_tgetent" = xyes ||
    test "x$ac_cv_lib_curses_tgetent" = xyes ||
    test "x$ac_cv_lib_ncurses_tgetent" = xyes; then
     AC_CHECK_LIB(readline,readline)
diff --git a/dumper-src/Makefile.am b/dumper-src/Makefile.am
index 442c876..c837f78 100644
--- a/dumper-src/Makefile.am
+++ b/dumper-src/Makefile.am
@@ -18,16 +18,3 @@ SUFFIXES =		.sh .pl
 			chmod a+x $@
 
 DISTCLEANFILES = $(dumper_SCRIPTS)
-
-# these are used for testing only:
-
-install-data-hook:
-	@list="$(dumper_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(dumperdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
diff --git a/dumper-src/Makefile.in b/dumper-src/Makefile.in
index 3b65707..c5598df 100644
--- a/dumper-src/Makefile.in
+++ b/dumper-src/Makefile.in
@@ -496,8 +496,6 @@ info: info-am
 info-am:
 
 install-data-am: install-dumperSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am:
 
@@ -528,13 +526,13 @@ uninstall-am: uninstall-dumperSCRIPTS uninstall-info-am
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-hook \
-	install-dumperSCRIPTS install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dumperSCRIPTS uninstall-info-am
+	install-data install-data-am install-dumperSCRIPTS \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-dumperSCRIPTS \
+	uninstall-info-am
 
 
 .pl:
@@ -545,18 +543,6 @@ uninstall-am: uninstall-dumperSCRIPTS uninstall-info-am
 .sh:
 			cat $< > $@
 			chmod a+x $@
-
-# these are used for testing only:
-
-install-data-hook:
-	@list="$(dumper_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(dumperdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/dumper-src/generic-dumper.pl.in b/dumper-src/generic-dumper.pl.in
index f1fc6d3..944d089 100644
--- a/dumper-src/generic-dumper.pl.in
+++ b/dumper-src/generic-dumper.pl.in
@@ -1,3 +1,6 @@
+#!@PERL@
+#
+
 require "newgetopt.pl";
 use Text::ParseWords;
 
@@ -201,11 +204,11 @@ sub wrapper_restore() {
 
 sub parse_options() {
    my($no_option) = @_;
-   my($options, @options, $option, $name, $option_name, $value);
+   my($no_options, @options, $option, $name, $option_name, $value);
 
    while($no_option <= $#ARGV) {
-      $options = $ARGV[${no_option}];
-      @options = split (/;/,$options);
+      $no_options = $ARGV[${no_option}];
+      @options = split (/;/,$no_options);
       foreach $option (@options) {
          if( $option =~ /=/ ) {
             ($name,$value) = split(/=/,$option);
diff --git a/man/Makefile.am b/man/Makefile.am
index d0cd8a5..b6bd224 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -107,20 +107,12 @@ if	ENABLE_MANPAGE_BUILD
 		pa=$(DESTDIR)$(man8dir)/`echo $$p|sed '$(transform)'`; \
 		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
 		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
-		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-		chown "$(BINARY_OWNER)" $$pa;		\
-		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-		chgrp "$(SETUID_GROUP)" $$pa;		\
 	done
 	@list="$(man5_pages)"; \
 	for p in $$list; do \
 		pa=$(DESTDIR)$(man5dir)/`echo $$p|sed '$(transform)'`; \
 		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
 		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
-		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-		chown "$(BINARY_OWNER)" $$pa;		\
-		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-		chgrp "$(SETUID_GROUP)" $$pa;		\
 	done
 else	!ENABLE_MANPAGE_BUILD
 	@list="$(man8_pages)"; \
@@ -129,10 +121,6 @@ else	!ENABLE_MANPAGE_BUILD
 		pa=$(DESTDIR)$(man8dir)/`echo $$p|sed '$(transform)'`; \
 		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
 		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
-		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-		chown "$(BINARY_OWNER)" $$pa;		\
-		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-		chgrp "$(SETUID_GROUP)" $$pa;		\
 	    fi \
 	done
 	@list="$(man5_pages)"; \
@@ -141,10 +129,6 @@ else	!ENABLE_MANPAGE_BUILD
 		pa=$(DESTDIR)$(man5dir)/`echo $$p|sed '$(transform)'`; \
 		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
 		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
-		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-		chown "$(BINARY_OWNER)" $$pa;		\
-		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-		chgrp "$(SETUID_GROUP)" $$pa;		\
 	    fi \
 	done
 endif
diff --git a/man/Makefile.in b/man/Makefile.in
index 4fcf374..7c66088 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -685,20 +685,12 @@ install-data-hook: $(ALL_MAN_PAGES)
 @ENABLE_MANPAGE_BUILD_TRUE@		pa=$(DESTDIR)$(man8dir)/`echo $$p|sed '$(transform)'`; \
 @ENABLE_MANPAGE_BUILD_TRUE@		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
 @ENABLE_MANPAGE_BUILD_TRUE@		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
-@ENABLE_MANPAGE_BUILD_TRUE@		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-@ENABLE_MANPAGE_BUILD_TRUE@		chown "$(BINARY_OWNER)" $$pa;		\
-@ENABLE_MANPAGE_BUILD_TRUE@		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-@ENABLE_MANPAGE_BUILD_TRUE@		chgrp "$(SETUID_GROUP)" $$pa;		\
 @ENABLE_MANPAGE_BUILD_TRUE@	done
 @ENABLE_MANPAGE_BUILD_TRUE@	@list="$(man5_pages)"; \
 @ENABLE_MANPAGE_BUILD_TRUE@	for p in $$list; do \
 @ENABLE_MANPAGE_BUILD_TRUE@		pa=$(DESTDIR)$(man5dir)/`echo $$p|sed '$(transform)'`; \
 @ENABLE_MANPAGE_BUILD_TRUE@		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
 @ENABLE_MANPAGE_BUILD_TRUE@		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
-@ENABLE_MANPAGE_BUILD_TRUE@		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-@ENABLE_MANPAGE_BUILD_TRUE@		chown "$(BINARY_OWNER)" $$pa;		\
-@ENABLE_MANPAGE_BUILD_TRUE@		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-@ENABLE_MANPAGE_BUILD_TRUE@		chgrp "$(SETUID_GROUP)" $$pa;		\
 @ENABLE_MANPAGE_BUILD_TRUE@	done
 @ENABLE_MANPAGE_BUILD_FALSE@	@list="$(man8_pages)"; \
 @ENABLE_MANPAGE_BUILD_FALSE@	for p in $$list; do \
@@ -706,10 +698,6 @@ install-data-hook: $(ALL_MAN_PAGES)
 @ENABLE_MANPAGE_BUILD_FALSE@		pa=$(DESTDIR)$(man8dir)/`echo $$p|sed '$(transform)'`; \
 @ENABLE_MANPAGE_BUILD_FALSE@		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
 @ENABLE_MANPAGE_BUILD_FALSE@		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
-@ENABLE_MANPAGE_BUILD_FALSE@		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-@ENABLE_MANPAGE_BUILD_FALSE@		chown "$(BINARY_OWNER)" $$pa;		\
-@ENABLE_MANPAGE_BUILD_FALSE@		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-@ENABLE_MANPAGE_BUILD_FALSE@		chgrp "$(SETUID_GROUP)" $$pa;		\
 @ENABLE_MANPAGE_BUILD_FALSE@	    fi \
 @ENABLE_MANPAGE_BUILD_FALSE@	done
 @ENABLE_MANPAGE_BUILD_FALSE@	@list="$(man5_pages)"; \
@@ -718,10 +706,6 @@ install-data-hook: $(ALL_MAN_PAGES)
 @ENABLE_MANPAGE_BUILD_FALSE@		pa=$(DESTDIR)$(man5dir)/`echo $$p|sed '$(transform)'`; \
 @ENABLE_MANPAGE_BUILD_FALSE@		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
 @ENABLE_MANPAGE_BUILD_FALSE@		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
-@ENABLE_MANPAGE_BUILD_FALSE@		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-@ENABLE_MANPAGE_BUILD_FALSE@		chown "$(BINARY_OWNER)" $$pa;		\
-@ENABLE_MANPAGE_BUILD_FALSE@		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-@ENABLE_MANPAGE_BUILD_FALSE@		chgrp "$(SETUID_GROUP)" $$pa;		\
 @ENABLE_MANPAGE_BUILD_FALSE@	    fi \
 @ENABLE_MANPAGE_BUILD_FALSE@	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/oldrecover-src/Makefile.am b/oldrecover-src/Makefile.am
index 766afd2..2140153 100644
--- a/oldrecover-src/Makefile.am
+++ b/oldrecover-src/Makefile.am
@@ -51,19 +51,6 @@ uparse.$(OBJEXT): $(srcdir)/uparse.c
 	$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
 
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-		echo chmod o-rwx $$pa; \
-		chmod o-rwx $$pa; \
-	done
-
-
 lint:
 	@ f="$(amoldrecover_CSRC)";					  	\
 	(cd ../common-src; make listlibsrc);					\
diff --git a/oldrecover-src/Makefile.in b/oldrecover-src/Makefile.in
index 448a206..7120b37 100644
--- a/oldrecover-src/Makefile.in
+++ b/oldrecover-src/Makefile.in
@@ -708,7 +708,7 @@ uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-hook install-info install-info-am \
+	install-exec-am install-info install-info-am \
 	install-man install-sbinPROGRAMS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
@@ -727,18 +727,6 @@ uscan.$(OBJEXT): $(srcdir)/uscan.c
 uparse.$(OBJEXT): $(srcdir)/uparse.c
 	$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-		echo chmod o-rwx $$pa; \
-		chmod o-rwx $$pa; \
-	done
-
 lint:
 	@ f="$(amoldrecover_CSRC)";					  	\
 	(cd ../common-src; make listlibsrc);					\
diff --git a/recover-src/Makefile.am b/recover-src/Makefile.am
index ac37b73..626bb69 100644
--- a/recover-src/Makefile.am
+++ b/recover-src/Makefile.am
@@ -51,19 +51,6 @@ uparse.$(OBJEXT): $(srcdir)/uparse.c
 	$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
 
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-		echo chmod o-rwx $$pa; \
-		chmod o-rwx $$pa; \
-	done
-
-
 lint:
 	@f="$(amrecover_CSRC)";							\
 	(cd ../common-src; make listlibsrc);					\
diff --git a/recover-src/Makefile.in b/recover-src/Makefile.in
index a317695..19b3f14 100644
--- a/recover-src/Makefile.in
+++ b/recover-src/Makefile.in
@@ -674,8 +674,6 @@ info-am:
 install-data-am:
 
 install-exec-am: install-sbinPROGRAMS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
 
@@ -708,8 +706,8 @@ uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-hook install-info install-info-am \
-	install-man install-sbinPROGRAMS install-strip installcheck \
+	install-exec-am install-info install-info-am install-man \
+	install-sbinPROGRAMS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
@@ -727,18 +725,6 @@ uscan.$(OBJEXT): $(srcdir)/uscan.c
 uparse.$(OBJEXT): $(srcdir)/uparse.c
 	$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-		echo chmod o-rwx $$pa; \
-		chmod o-rwx $$pa; \
-	done
-
 lint:
 	@f="$(amrecover_CSRC)";							\
 	(cd ../common-src; make listlibsrc);					\
diff --git a/restore-src/Makefile.am b/restore-src/Makefile.am
index f12bdbf..12c9073 100644
--- a/restore-src/Makefile.am
+++ b/restore-src/Makefile.am
@@ -45,24 +45,6 @@ librestore_la_LIBADD	=	../common-src/libamanda.$(LIB_EXTENSION) \
 
 noinst_HEADERS = restore.h
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS) $(sbin_PROGRAMS); do			\
 		f="$$p.c $(librestore_la_SOURCES)";				\
diff --git a/restore-src/Makefile.in b/restore-src/Makefile.in
index ec68cbe..24d1398 100644
--- a/restore-src/Makefile.in
+++ b/restore-src/Makefile.in
@@ -731,8 +731,6 @@ install-data-am:
 
 install-exec-am: install-libLTLIBRARIES install-libexecPROGRAMS \
 	install-sbinPROGRAMS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
 
@@ -767,7 +765,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-exec install-exec-am \
-	install-exec-hook install-info install-info-am \
+	install-info install-info-am \
 	install-libLTLIBRARIES install-libexecPROGRAMS install-man \
 	install-sbinPROGRAMS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
@@ -778,24 +776,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	uninstall-sbinPROGRAMS
 
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS) $(sbin_PROGRAMS); do			\
 		f="$$p.c $(librestore_la_SOURCES)";				\
diff --git a/server-src/Makefile.am b/server-src/Makefile.am
index c883daf..6fa3d1e 100644
--- a/server-src/Makefile.am
+++ b/server-src/Makefile.am
@@ -36,6 +36,8 @@ libamserver_la_SOURCES=	amindex.c	changer.c			\
 
 libamserver_la_LDFLAGS= -release $(VERSION)
 
+libamserver_la_LIBADD = ../tape-src/libamtape.$(LIB_EXTENSION)
+
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
 # libraries, and because of the way libtool sets up the command line, we
@@ -92,50 +94,6 @@ noinst_HEADERS = 	amindex.h	changer.h			\
 			tapefile.h	find.h		server_util.h	\
 			taperscan.h cmdline.h
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS) $(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="amcheck"; \
-	for p in $$list; do \
-		if echo "$(sbin_PROGRAMS)" | grep $$p >/dev/null 2>&1; then \
-			pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-			echo chown root $$pa; \
-			chown root $$pa; \
-			echo chmod u+s,o-rwx $$pa; \
-			chmod u+s,o-rwx $$pa; \
-		else true; \
-		fi; \
-	done
-##						       ##
-## enterprise version will install dumper/planner suid ##
-##						       ##
-
-	@list="dumper planner"; \
-	for p in $$list; do \
-		if echo "$(libexec_PROGRAMS)" | grep $$p >/dev/null 2>&1; then \
-			pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-			echo chown root $$pa; \
-			chown root $$pa; \
-			echo chmod u+s,o-rwx $$pa; \
-			chmod u+s,o-rwx $$pa; \
-		else true; \
-		fi; \
-	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS) $(sbin_PROGRAMS); do			\
 		if [ $$p = "amindexd" ]; then					\
diff --git a/server-src/Makefile.in b/server-src/Makefile.in
index 1b30e78..f254ebf 100644
--- a/server-src/Makefile.in
+++ b/server-src/Makefile.in
@@ -1084,8 +1084,6 @@ install-data-am:
 
 install-exec-am: install-libLTLIBRARIES install-libexecPROGRAMS \
 	install-sbinPROGRAMS install-sbinSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
 
@@ -1121,15 +1119,15 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-exec install-exec-am \
-	install-exec-hook install-info install-info-am \
-	install-libLTLIBRARIES install-libexecPROGRAMS install-man \
-	install-sbinPROGRAMS install-sbinSCRIPTS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \
-	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
+	install-info install-info-am install-libLTLIBRARIES \
+	install-libexecPROGRAMS install-man install-sbinPROGRAMS \
+	install-sbinSCRIPTS install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \
+	uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS \
+	uninstall-sbinSCRIPTS
 
 
 .pl:
@@ -1141,47 +1139,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 			cat $< > $@
 			chmod a+x $@
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS) $(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="amcheck"; \
-	for p in $$list; do \
-		if echo "$(sbin_PROGRAMS)" | grep $$p >/dev/null 2>&1; then \
-			pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-			echo chown root $$pa; \
-			chown root $$pa; \
-			echo chmod u+s,o-rwx $$pa; \
-			chmod u+s,o-rwx $$pa; \
-		else true; \
-		fi; \
-	done
-
-	@list="dumper planner"; \
-	for p in $$list; do \
-		if echo "$(libexec_PROGRAMS)" | grep $$p >/dev/null 2>&1; then \
-			pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-			echo chown root $$pa; \
-			chown root $$pa; \
-			echo chmod u+s,o-rwx $$pa; \
-			chmod u+s,o-rwx $$pa; \
-		else true; \
-		fi; \
-	done
-
 lint:
 	@ for p in $(libexec_PROGRAMS) $(sbin_PROGRAMS); do			\
 		if [ $$p = "amindexd" ]; then					\
diff --git a/server-src/taper.c b/server-src/taper.c
index 3a10efe..5e14400 100644
--- a/server-src/taper.c
+++ b/server-src/taper.c
@@ -139,10 +139,10 @@ char *attach_buffers(size_t size);
 void detach_buffers(char *bufp);
 void destroy_buffers(void);
 #define REMOVE_SHARED_MEMORY() \
-    detach_buffers(buffers); \
     if (strcmp(procname, "reader") == 0) { \
 	destroy_buffers(); \
-    }
+    } \
+    detach_buffers(buffers);
 
 /* synchronization pipe routines */
 void syncpipe_init(int rd, int wr);
diff --git a/tape-src/Makefile.am b/tape-src/Makefile.am
index 68b48b5..f96f1fc 100644
--- a/tape-src/Makefile.am
+++ b/tape-src/Makefile.am
@@ -20,6 +20,8 @@ libamtape_la_SOURCES = 	output-file.c \
 
 libamtape_la_LDFLAGS =  -release $(VERSION)
 
+libamtape_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
+
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
 # libraries, and because of the way libtool sets up the command line, we
@@ -48,24 +50,6 @@ noinst_HEADERS = 	\
 			output-tape.h \
 			tapeio.h
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS) $(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
 amtapeio_SOURCES = amtapeio.test.c
 amtapeio_LDADD =	../common-src/libamanda.$(LIB_EXTENSION) \
 			libamtape.$(LIB_EXTENSION) \
diff --git a/tape-src/Makefile.in b/tape-src/Makefile.in
index acdcd45..adf1460 100644
--- a/tape-src/Makefile.in
+++ b/tape-src/Makefile.in
@@ -98,7 +98,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libamtape_la_LIBADD =
+libamtape_la_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)
 am_libamtape_la_OBJECTS = output-file.lo output-null.lo output-rait.lo \
 	output-tape.lo tapeio.lo
 libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS)
@@ -409,6 +409,7 @@ libamtape_la_SOURCES = output-file.c \
 			tapeio.c
 
 libamtape_la_LDFLAGS = -release $(VERSION)
+libamtape_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
 
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
@@ -718,8 +719,6 @@ info-am:
 install-data-am:
 
 install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
 
@@ -753,9 +752,9 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-exec-hook \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-sbinPROGRAMS install-strip installcheck \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-sbinPROGRAMS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
@@ -763,24 +762,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS
 
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS) $(sbin_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-
 amtapeio.test.c: $(srcdir)/tapeio.c
 	echo '#define TEST' >$@
 	echo '#include "$<"' >>$@

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional