$NetBSD: patch-aa,v 1.3 2005/04/13 16:45:46 rillig Exp $

--- unix/Makefile.gtk.orig	2005-04-06 23:00:44.000000000 +0200
+++ unix/Makefile.gtk	2005-04-06 23:04:54.000000000 +0200
@@ -80,16 +80,13 @@
 
 # You can define this path to point at your tools if you need to
 # TOOLPATH = /opt/gcc/bin
-CC = $(TOOLPATH)cc
+#CC = $(TOOLPATH)cc
 
-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
+CFLAGS += -Wall -Werror -I.././ -I../charset/ -I../windows/ -I../unix/ \
 		-I../mac/ -I../macosx/ `gtk-config --cflags`
 XLDFLAGS = `gtk-config --libs`
-ULDFLAGS =#
-INSTALL=install
-INSTALL_PROGRAM=$(INSTALL)
-INSTALL_DATA=$(INSTALL)
-prefix=/usr/local
+ULDFLAGS = $(LDFLAGS)
+prefix=$(PREFIX)
 exec_prefix=$(prefix)
 bindir=$(exec_prefix)/bin
 mandir=$(prefix)/man
@@ -834,10 +831,10 @@
 		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
 	fi
 install:
-	$(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink
-	$(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp
-	$(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp
-	$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
+	$(BSD_INSTALL_PROGRAM) plink $(DESTDIR)$(bindir)/plink
+	$(BSD_INSTALL_PROGRAM) pscp $(DESTDIR)$(bindir)/pscp
+	$(BSD_INSTALL_PROGRAM) psftp $(DESTDIR)$(bindir)/psftp
+	$(BSD_INSTALL_PROGRAM) pterm $(DESTDIR)$(bindir)/pterm
 	if test -n "$(UTMP_GROUP)"; then \
 	  chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
 	    chmod 2755 $(DESTDIR)$(bindir)/pterm; \
@@ -845,16 +842,16 @@
 	  chown $(UTMP_USER) $(DESTDIR)$(bindir)/pterm && \
 	    chmod 4755 $(DESTDIR)$(bindir)/pterm; \
 	fi
-	$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty
-	$(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen
-	$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel
-	$(INSTALL_DATA) -m 644 ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1
-	$(INSTALL_DATA) -m 644 ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1
-	$(INSTALL_DATA) -m 644 ../doc/psftp.1 $(DESTDIR)$(man1dir)/psftp.1
-	$(INSTALL_DATA) -m 644 ../doc/pterm.1 $(DESTDIR)$(man1dir)/pterm.1
-	$(INSTALL_DATA) -m 644 ../doc/putty.1 $(DESTDIR)$(man1dir)/putty.1
-	$(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
-	$(INSTALL_DATA) -m 644 ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1
+	$(BSD_INSTALL_PROGRAM) putty $(DESTDIR)$(bindir)/putty
+	$(BSD_INSTALL_PROGRAM) puttygen $(DESTDIR)$(bindir)/puttygen
+	$(BSD_INSTALL_PROGRAM) puttytel $(DESTDIR)$(bindir)/puttytel
+	$(BSD_INSTALL_MAN) ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1
+	$(BSD_INSTALL_MAN) ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1
+	$(BSD_INSTALL_MAN) ../doc/psftp.1 $(DESTDIR)$(man1dir)/psftp.1
+	$(BSD_INSTALL_MAN) ../doc/pterm.1 $(DESTDIR)$(man1dir)/pterm.1
+	$(BSD_INSTALL_MAN) ../doc/putty.1 $(DESTDIR)$(man1dir)/putty.1
+	$(BSD_INSTALL_MAN) ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
+	$(BSD_INSTALL_MAN) ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1
 
 install-strip:
 	$(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s"
