File vdradmin-3.6.7-destdir-fix.diff of Package vdradmin-am

Index: b/install.sh
===================================================================
--- a/install.sh
+++ b/install.sh
@@ -6,19 +6,19 @@
 # Download and patchscript for VDRAdmin-AM
 # (based on install.sh Copyright (c) 2003 Frank (xpix) Herrmann)
 
 PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin
 DESTDIR=${DESTDIR}
-LIBDIR=${LIBDIR:-$DESTDIR/usr/share/vdradmin}
-ETCDIR=${ETCDIR:-$DESTDIR/etc/vdradmin}
-DOCDIR=${DOCDIR:-$DESTDIR/usr/share/doc/vdradmin}
-BINDIR=${BINDIR:-$DESTDIR/usr/bin}
-LOCDIR=${LOCDIR:-$DESTDIR/usr/share/locale}
-MANDIR=${MANDIR:-$DESTDIR/usr/share/man}
-LOGDIR=${LOGDIR:-$DESTDIR/var/log/vdradmin}
-CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin}
-PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmin/vdradmind.pid}
+LIBDIR=${LIBDIR:-/usr/share/vdradmin}
+ETCDIR=${ETCDIR:-/etc/vdradmin}
+DOCDIR=${DOCDIR:-/usr/share/doc/vdradmin}
+BINDIR=${BINDIR:-/usr/bin}
+LOCDIR=${LOCDIR:-/usr/share/locale}
+MANDIR=${MANDIR:-/usr/share/man}
+LOGDIR=${LOGDIR:-/var/log}
+CACHEDIR=${CACHEDIR:-/var/cache/vdradmin}
+PIDFILE=${PIDFILE:-/var/run/vdradmind.pid}
 VIDEODIR=${VIDEODIR:-/video}
 EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages}
 VDRCONF=${VDRCONF:-$VIDEODIR}
 
 function usage()
@@ -144,31 +144,31 @@ function doInstall()
 	echo "********* Installing VDRAdmin-AM *************"
 	echo ""
 
 	perlModules
 
-	makeDir $LIBDIR 1 && cp -r template lib $LIBDIR || exit 1
-	makeDir $BINDIR || exit 1
-	makeDir $DOCDIR && cp -r contrib COPYING CREDITS HISTORY INSTALL LGPL.txt README* REQUIREMENTS FAQ $DOCDIR || exit 1
-	makeDir $MANDIR/man8 && cp vdradmind.pl.1 $MANDIR/man8/vdradmind.8 || exit 1
+	makeDir ${DESTDIR}/$LIBDIR 1 && cp -r template lib ${DESTDIR}/$LIBDIR || exit 1
+	makeDir ${DESTDIR}/$BINDIR || exit 1
+	makeDir ${DESTDIR}/$DOCDIR && cp -r contrib COPYING CREDITS HISTORY INSTALL LGPL.txt README* REQUIREMENTS FAQ ${DESTDIR}/$DOCDIR || exit 1
+	makeDir ${DESTDIR}/$MANDIR/man8 && cp vdradmind.pl.1 ${DESTDIR}/$MANDIR/man8/vdradmind.8 || exit 1
 
 	(
 		cd locale
 		for lang in *
 		do
-			makeDir $LOCDIR/$lang/LC_MESSAGES/ && install -m 644 $lang/LC_MESSAGES/vdradmin.mo $LOCDIR/$lang/LC_MESSAGES/vdradmin.mo || exit 1
+			makeDir ${DESTDIR}/$LOCDIR/$lang/LC_MESSAGES/ && install -m 644 $lang/LC_MESSAGES/vdradmin.mo ${DESTDIR}/$LOCDIR/$lang/LC_MESSAGES/vdradmin.mo || exit 1
 		done
 	)
 
 	local RESTART=
-	if [ -d $BINDIR ]; then
+	if [ -d ${DESTDIR}/$BINDIR ]; then
 		killRunningVDRAdmin
 		if [ $? -ne 0 ] ; then
 			RESTART=1
 			echo "Killed running VDRAdmin-AM..."
 		fi
-		sed <vdradmind.pl >$BINDIR/vdradmind \
+		sed <vdradmind.pl >${DESTDIR}/$BINDIR/vdradmind \
 		    -e "s/^\(my \$SEARCH_FILES_IN_SYSTEM *=\) 0;/\1 1;/" \
 		    -e "s:/usr/share/vdradmin/lib:${LIBDIR}/lib:" \
 		    -e "s:/usr/share/vdradmin/template:${LIBDIR}/template:" \
 		   -e "s:/var/log/vdradmin:${LOGDIR}:" \
 		    -e "s:/var/cache/vdradmin:${CACHEDIR}:" \
@@ -177,45 +177,45 @@ function doInstall()
 		    -e "s:/usr/share/locale:${LOCDIR}:" \
 		    -e "s:\(\$CONFIG{VIDEODIR} *= \)\"/video\";:\1\"${VIDEODIR}\";:" \
 		    -e "s:\(\$CONFIG{EPGIMAGES} *= \)\"\$CONFIG{VIDEODIR}/epgimages\";:\1\"${EPGIMAGES}\";:" \
 				-e "s:\(\$CONFIG{VDRCONFDIR} *= \)\"\$CONFIG{VIDEODIR}\";:\1\"${VDRCONF}\";:"
 
-		chmod a+x  $BINDIR/vdradmind
+		chmod a+x  ${DESTDIR}/$BINDIR/vdradmind
 
 		if [ "$CONFIG" ]; then
 			echo "Configuring VDRAdmin-AM..."
-			$BINDIR/vdradmind -c
+			${DESTDIR}/$BINDIR/vdradmind -c
 		fi
 
 		if [ "$RESTART" ]; then
 			echo "Restarting VDRAdmin-AM..."
-			$BINDIR/vdradmind
+			${DESTDIR}/$BINDIR/vdradmind
 		fi
 
 		echo ""
-		if [ -e $BINDIR/vdradmind.pl ]; then
-			echo "Removing ancient $BINDIR/vdradmind.pl"
-			rm -f $BINDIR/vdradmind.pl
+		if [ -e ${DESTDIR}/$BINDIR/vdradmind.pl ]; then
+			echo "Removing ancient ${DESTDIR}/$BINDIR/vdradmind.pl"
+			rm -f ${DESTDIR}/$BINDIR/vdradmind.pl
 		fi
 		for man in man1/vdradmind.pl.1 man1/vdradmind.1; do
-			if [ -e $MANDIR/$man ]; then
-				echo "Removing ancient $MANDIR/$man"
-				rm -f $MANDIR/$man
+			if [ -e ${DESTDIR}/$MANDIR/$man ]; then
+				echo "Removing ancient ${DESTDIR}/$MANDIR/$man"
+				rm -f ${DESTDIR}/$MANDIR/$man
 			fi
 		done
 	else
-		echo "$BINDIR exists but is no directory!"
+		echo "${DESTDIR}/$BINDIR exists but is no directory!"
 		echo "Aborting..."
 		exit 1
 	fi
 
 	echo ""
 	echo ""
 	echo "VDRAdmin-AM has been installed!"
 	echo ""
 	if [ -z "$RESTART" ]; then
-		echo "Run \"$BINDIR/vdradmind\" to start VDRAdmin-AM."
+		echo "Run \"${DESTDIR}/$BINDIR/vdradmind\" to start VDRAdmin-AM."
 		echo ""
 	fi
 	echo "NOTE:"
 	echo "If you want to run VDRAdmin-AM in a different language you must set the LANG environment variable (see README)."
 	echo ""