From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 24 Apr 2011 12:30:14 +0000 (+0200)
Subject: telnet: Some cosmetic fixes.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cacad81be96c3bfcc4f89d8431ed72452c6ba300;p=ipfire-3.x.git

telnet: Some cosmetic fixes.
---

diff --git a/pkgs/telnet/telnet.nm b/pkgs/telnet/telnet.nm
index dfa7f0bb6..64d2e7a4a 100644
--- a/pkgs/telnet/telnet.nm
+++ b/pkgs/telnet/telnet.nm
@@ -24,9 +24,9 @@
 
 include $(PKGROOT)/Include
 
-PKG_NAME       = netkit-telnet
+PKG_NAME       = telnet
 PKG_VER        = 0.17
-PKG_REL        = 1
+PKG_REL        = 2
 
 PKG_MAINTAINER =
 PKG_GROUPS     = Applications/Internet
@@ -42,11 +42,17 @@ define PKG_DESCRIPTION
 	logins into the host machine.
 endef
 
-PKG_TARBALL    = $(THISAPP).tar.gz
+PKG_TARBALL    = netkit-$(THISAPP).tar.gz
 PKG_OBJECTS   += telnet-client.tar.gz
 
-CONFIGURE_OPTIONS =
+DIR_APP = $(DIR_SRC)/netkit-$(THISAPP)
 
+# Overwite configure options, because configure script 
+# doesn't accept flags for used compiler or host definition
+CONFIGURE_OPTIONS = \
+	--prefix=/usr
+
+# Apply patches in a special order
 PKG_PATCHES    = telnet-client-cvs.patch0 \
 	telnetd-0.17.patch0 \
 	telnet-0.17-env.patch \
@@ -74,15 +80,18 @@ define STAGE_PREPARE
 endef
 
 define STAGE_INSTALL
+	# We have to create the directories on our own
 	-mkdir -pv $(BUILDROOT)/usr/man/man{1,5,8}
 	-mkdir -pv $(BUILDROOT)/usr/{,s}bin 
 
 	cd $(DIR_APP) && make install INSTALLROOT=$(BUILDROOT)
 
+	# Move manpages to correct place
 	-mkdir -pv $(BUILDROOT)/usr/share
 	mv $(BUILDROOT)/usr/man $(BUILDROOT)/usr/share/man
+
+	# Remove telnetd, we don't want it
 	rm -rf $(BUILDROOT)/usr/sbin
 	rm -rf $(BUILDROOT)/usr/share/man/man8
 	rm -rf $(BUILDROOT)/usr/share/man/man5
-
 endef