Included 2 small patches by Mike Frysinger (makefile fix, 64bit cleanup)

git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@86 bc163920-b10d-0410-b2c5-a5491ca2ceef

CHANGES

@@ -3,6 +3,8 @@ Changes to proxytunnel version 1.5.x -- not yet released
 - Small change to make compiler on tandem/hp-nonstop happy
   by Roberto Veldhoven
 - Small change to work around broken proxies by Stephane Engel
+- Changed client_len from size_t to socklen_t (64bit required)
+- Makefile vars now no longer override environment versions
 
 Changes to proxytunnel version 1.5.2 -- Fri Dec 16 09:27:11 CET 2005
 

CREDITS

@@ -16,6 +16,7 @@ people.
 	Joerg Wunsch <j@uriah.heep.sax.de>	- Password prompt suggestion
 	Roberto Veldhoven at atosorigin.com	- Tandem compile fix
 	Stephane Engel at macchiati.org		- Fix for broken proxy
+	Mike Frysinger <vapier@gentoo.org>	- Makefile fix, 64bit fix
 
 
 Furthermore we would like to thank the wonderful people at SourceForge

Makefile

@@ -2,11 +2,14 @@
 #
 # Please uncomment the appropriate settings
 
-CC = gcc
-CFLAGS = -Wall -DHAVE_GETOPT_LONG -DWITH_NTLM
-LDFLAGS = -lssl
-INSTALLPATH = $(DESTDIR)/usr/local/bin
-MANPATH = $(DESTDIR)/usr/man/man1
+CC ?= gcc
+CFLAGS += -Wall -DHAVE_GETOPT_LONG -DWITH_NTLM
+LDFLAGS += -lssl
+BINDIR = /usr/local/bin
+INSTALLPATH = $(DESTDIR)/$(BINDIR)
+MANPATH = /usr/share/man/man1
+INSTALLMANPATH = $(DESTDIR)/$(MANPATH)
+
 
 PROGNAME = proxytunnel
 OBJ = proxytunnel.o	\
@@ -25,6 +28,6 @@ clean:
 	@rm -f $(PROGNAME) $(OBJ)
 
 install:
-		mkdir -p $(INSTALLPATH)
+		mkdir -p $(INSTALLPATH) $(INSTALLMANPATH)
 		install -g root -m755 -o root $(PROGNAME) $(INSTALLPATH)/$(PROGNAME)
-		install -g root -m644 -o root debian/$(PROGNAME).1 $(MANPATH)/$(PROGNAME).1
+		install -g root -m644 -o root debian/$(PROGNAME).1 $(INSTALLMANPATH)/$(PROGNAME).1

proxytunnel.c

@@ -149,7 +149,7 @@ void do_daemon()
 	int			listen_sd;
 	struct sockaddr_in	sa_serv;
 	struct sockaddr_in	sa_cli;
-	size_t			client_len;
+	socklen_t		client_len;
 	int			pid = 0;
 	int			sd_client;
 	char			buf[80];