--- Makefile.orig	Sat Dec 16 16:44:10 2000
+++ Makefile	Fri Jan 12 19:12:32 2001
@@ -8,7 +8,7 @@
 CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS)
 endif
 
-CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS) -DDEBUG_ALL
+CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_THREAD_SAFE
 # -ggdb
 
 export CXXFLAGS LOCALEDIR
@@ -21,10 +21,10 @@
 endif
 
 LOCALEDIR=$(DEST)/share/locale
-PTHREAD=-lpthread
-GTKCONFIG=gtk-config
-GLIBCONFIG=glib-config
-MAKE=make
+PTHREAD?=-lpthread
+GTKCONFIG?=gtk-config
+GLIBCONFIG?=glib-config
+MAKE?=make
 
 #next strings were added for BSD support
 ifeq ($(OSTYPE),BSD)
@@ -39,8 +39,8 @@
 MAKE=gmake
 endif
 
-GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
-GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags)
+GTKLIBS=$(shell $(GTKCONFIG) --libs) #$(shell $(GLIBCONFIG) --libs)
+GTKFLAGS=$(shell $(GTKCONFIG) --cflags) #$(shell $(GLIBCONFIG) --cflags)
 
 ifeq ($(OSTYPE),Irix)
 CTKFLIBS += lintl
@@ -81,7 +81,7 @@
 
 
 install: all
-	install -c -m755 nt $(DEST)/bin
+	${BSD_INSTALL_PROGRAM} nt $(DEST)/bin
 	[ -z "$(NLS)" ] || $(MAKE) install -C po
 
 clean: