--- ckermit-8.0/makefile	2004-04-17 20:52:00.000000000 +0200
+++ ckermit-8.0.orig/makefile	2005-08-04 16:31:29.000000000 +0200
@@ -902,10 +902,11 @@
 BINARY = wermit
 DESTDIR =
 BINDIR = $(prefix)/bin
-MANDIR = $(manroot)/man/man1
+DATADIR = $(prefix)/share
+MANDIR = $(DATADIR)/man/man1
 MANEXT = 1
 SRCDIR =
-INFODIR =
+INFODIR = $(DATADIR)/info
 CERTDIR =
 
 TEXTFILES = COPYING.TXT ckcbwr.txt ckubwr.txt ckuins.txt ckccfg.txt \
@@ -966,7 +967,7 @@
 		else\
 			echo "Creating $(DESTDIR)...";\
 			DESTDIR=`echo $(DESTDIR) | sed 's!/*$$!!'`;\
-			mkdir $$DESTDIR  || exit 1;\
+			mkdir -p $$DESTDIR  || exit 1;\
 		fi;\
 		chmod 755 $(DESTDIR) || exit 1;\
 	fi;\
@@ -985,7 +986,7 @@
 		echo  "$(DESTDIR)$(BINDIR) exists...";\
 	else\
 		echo "Creating $(DESTDIR)$(BINDIR)/...";\
-		mkdir     $(DESTDIR)$(BINDIR) || exit 1;\
+		mkdir -p $(DESTDIR)$(BINDIR) || exit 1;\
 		chmod 755 $(DESTDIR)$(BINDIR);\
 	fi;\
 	rm -f $(DESTDIR)$(BINDIR)/kermit;\
@@ -998,7 +999,7 @@
 	echo "RmF $(DESTDIR)$(BINDIR)/kermit-sshsub" >&3;\
 	echo "RmF $(DESTDIR)$(BINDIR)/kermit" >&3;\
 	if test -f ckermit.ini; then\
-		echo "#!$(DESTDIR)$(BINDIR)/kermit" >\
+		echo "#!$(BINDIR)/kermit" >\
 			$(DESTDIR)$(BINDIR)/_tmp.ini;\
 		cat ckermit.ini >> $(DESTDIR)$(BINDIR)/_tmp.ini;\
 		mv $(DESTDIR)$(BINDIR)/_tmp.ini\
@@ -1020,19 +1021,19 @@
 	echo;\
 	echo MANDIR=$(MANDIR);\
 	if test -n "$(MANDIR)"; then\
-		if test -d $(MANDIR); then\
-			echo  "$(MANDIR) exists...";\
+		if test -d $(DESTDIR)$(MANDIR); then\
+			echo  "$(DESTDIR)$(MANDIR) exists...";\
 		else\
-			echo "Creating $(MANDIR)...";\
-			mkdir $(MANDIR) || exit 1;\
-			chmod 755 $(MANDIR) || exit 1;\
+			echo "Creating $(DESTDIR)$(MANDIR)...";\
+			mkdir -p $(DESTDIR)$(MANDIR) || exit 1;\
+			chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
 		fi;\
 		echo "Installing man page...";\
-		rm -f $(MANDIR)/kermit.$(MANEXT);\
-		cp    ckuker.nr $(MANDIR)/kermit.$(MANEXT) || exit 1;\
-		chmod 644       $(MANDIR)/kermit.$(MANEXT) || exit 1;\
+		rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
+		cp    ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
+		chmod 644       $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
 		echo 'set flag=f\nPrC Removing man pages' >&3;\
-		echo "RmF $(MANDIR)/kermit.$(MANEXT)" >&3;\
+		echo "RmF $(DESTDIR)$(MANDIR)/kermit.$(MANEXT)" >&3;\
 		echo 'EfM' >&3;\
 		echo;\
 	else\
@@ -1041,18 +1042,18 @@
 	echo CERTDIR=$(CERTDIR);\
 	if test -n "$(CERTDIR)"; then\
 		if test -f ca_certs.pem; then\
-			if test -d $(CERTDIR); then\
-				echo  "$(CERTDIR) exists...";\
+			if test -d $(DESTDIR)$(CERTDIR); then\
+				echo  "$(DESTDIR)$(CERTDIR) exists...";\
 			else\
-				echo "Creating $(CERTDIR)...";\
-				mkdir $(CERTDIR) || exit 1;\
-				chmod 755 $(CERTDIR) || exit 1;\
+				echo "Creating $(DESTDIR)$(CERTDIR)...";\
+				mkdir -p $(DESTDIR)$(CERTDIR) || exit 1;\
+				chmod 755 $(DESTDIR)$(CERTDIR) || exit 1;\
 			fi;\
 			echo "Installing certificates file...";\
-			cp ca_certs.pem $(CERTDIR) || exit 1;\
+			cp ca_certs.pem $(DESTDIR)$(CERTDIR) || exit 1;\
 			echo 'set flag=f' >&3;\
 			echo 'PrC Removing certificates file' >&3;\
-			echo "RmF $(CERTDIR)/ca_certs.pem" >&3;\
+			echo "RmF $(DESTDIR)$(CERTDIR)/ca_certs.pem" >&3;\
 			echo 'EfM' >&3;\
 			echo;\
 		fi;\
@@ -1110,8 +1111,8 @@
 	echo "RmD $(DESTDIR)$(BINDIR)" >&3;\
 	echo "RmD $(DESTDIR)$(SRCDIR)" >&3;\
 	echo "RmD $(DESTDIR)$(INFODIR)" >&3;\
-	echo "RmD $(CERTDIR)" >&3;\
-	echo "RmD $(MANDIR)" >&3;\
+	echo "RmD $(DESTDIR)$(CERTDIR)" >&3;\
+	echo "RmD $(DESTDIR)$(MANDIR)" >&3;\
 	echo "RmD $(DESTDIR)" >&3;\
 	echo "EfM" >&3;\
 	echo "PrN C-Kermit version $(CKVER) is uninstalled!" >&3;\