--- makeself-2.1.4/makeself.sh.deb	2005-06-03 04:00:42.000000000 +0200
+++ makeself-2.1.4/makeself.sh	2006-05-14 11:51:27.000000000 +0200
@@ -119,7 +119,7 @@
 APPEND=n
 COPY=none
 TAR_ARGS=cvf
-HEADER=`dirname $0`/makeself-header.sh
+HEADER=/usr/share/makeself/makeself-header
 
 # LSM file stuff
 LSM_CMD="echo No LSM. >> \"\$archname\""
@@ -204,7 +204,17 @@
     esac
 done
 
-archdir="$1"
+if test $# -lt 1; then
+	MS_Usage
+else
+	if test -d "$1"; then
+		archdir="$1"
+	else
+		echo "Directory $1 doesn't exist"
+		exit 1
+	fi
+fi
+
 archname="$2"
 
 if test "$APPEND" = y; then
@@ -268,7 +278,11 @@
     ;;
 esac
 
-tmpfile="${TMPDIR:=/tmp}/mkself$$"
+tmpfile=`mktemp -q ${TMPDIR:=/tmp}/mkself.XXXXXX`
+if [ $? -ne 0 ]; then
+	echo "Can't create temp file"
+	exit 1
+fi
 
 if test -f $HEADER; then
 	oldarchname="$archname"
@@ -328,8 +342,8 @@
 # Try to locate a MD5 binary
 OLD_PATH=$PATH
 PATH=${GUESS_MD5_PATH:-"$OLD_PATH:/bin:/usr/bin:/sbin:/usr/local/ssl/bin:/usr/local/bin:/opt/openssl/bin"}
-MD5_PATH=`type -p md5sum`
-MD5_PATH=${MD5_PATH:-`type -p md5`}
+MD5_PATH=`type md5sum | cut -c 11-`
+MD5_PATH=${MD5_PATH:-`type md5 | cut -c 8-`}
 PATH=$OLD_PATH
 
 if test "$NOMD5" = y; then
--- makeself-2.1.4/makeself-header.sh.deb	2005-06-03 04:00:42.000000000 +0200
+++ makeself-2.1.4/makeself-header.sh	2006-05-14 11:48:42.000000000 +0200
@@ -75,8 +75,8 @@
 {
     OLD_PATH=\$PATH
     PATH=\${GUESS_MD5_PATH:-"\$OLD_PATH:/bin:/usr/bin:/sbin:/usr/local/ssl/bin:/usr/local/bin:/opt/openssl/bin"}
-    MD5_PATH=\`exec 2>&-; which md5sum || type md5sum\`
-    MD5_PATH=\${MD5_PATH:-\`exec 2>&-; which md5 || type md5\`}
+    MD5_PATH=\`exec 2>&-; which md5sum || type md5sum | cut -c 11-\`
+    MD5_PATH=\${MD5_PATH:-\`exec 2>&-; which md5 || type md5 | cut -c 8-\`}
     PATH=\$OLD_PATH
     MS_Printf "Verifying archive integrity..."
     offset=\`head -n $SKIP "\$1" | wc -c | tr -d " "\`