--- Makefile.orig	Fri Jan 26 18:05:26 2001
+++ Makefile	Fri Jan 26 21:58:20 2001
@@ -8,7 +8,7 @@
 CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS)
 endif
 
-CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS)
+CXXFLAGS+=-D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS)
 #-DDEBUG_ALL
 # -ggdb
 
@@ -34,8 +34,9 @@
 
 ifeq ($(OSTYPE),FreeBSD)
 PTHREAD=-pthread
-GTKCONFIG=gtk12-config
-MAKE=gmake
+GTKCONFIG=${GTK_CONFIG}
+GLIBCONFIG=${GLIB_CONFIG}
+MAKE=${MAKE_CMD}
 endif
 
 GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
@@ -80,7 +81,7 @@
 
 
 install: all
-	install -c -m755 nt $(DEST)/bin
+	${BSD_INSTALL_PROGRAM} nt $(DEST)/bin
 	[ -z "$(NLS)" ] || $(MAKE) install -C po
 
 clean: