From: Ian Beckwith <ianb@erislabs.net>
Date: Sat, 28 Jan 2012 22:42:40 +0000 (+0000)
Subject: 010_makefile-destdir-support: remove patch, taken upstream
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=f479b86ceaad1d76272d69576123dc3b19563335

010_makefile-destdir-support: remove patch, taken upstream
---

diff --git a/debian/patches/010_makefile-destdir-support.patch b/debian/patches/010_makefile-destdir-support.patch
deleted file mode 100644
index d3d2854..0000000
--- a/debian/patches/010_makefile-destdir-support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Patch makefile to support install to a staging area with DESTDIR
---- ckermit-211.orig/makefile
-+++ ckermit-211/makefile
-@@ -998,7 +998,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\
-@@ -1019,20 +1019,20 @@
- 	echo " for details.";\
- 	echo;\
- 	echo MANDIR=$(MANDIR);\
--	if test -n "$(MANDIR)"; then\
--		if test -d $(MANDIR); then\
--			echo  "$(MANDIR) exists...";\
-+	if test -n "$(DESTDIR)$(MANDIR)"; then\
-+		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 $(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\
diff --git a/debian/patches/series b/debian/patches/series
index 5623377..7a5d0da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-010_makefile-destdir-support.patch
 020_man-hyphen-quoting.patch
 030_fix-if-else.patch
 040_pam-password-prompting.patch