--- Makefile.orig	Tue Mar  9 12:44:53 1999
+++ Makefile	Sun Mar 14 23:27:50 1999
@@ -3,25 +3,25 @@
 BUILD_TARGET = BUILD_GTK
 #BUILD_TARGET = BUILD_MOTIF
 
-WXFTP_HELP_DIR = /usr/local/share/wxftp/help/
+WXFTP_HELP_DIR = ${X11BASE}/share/wxftp/help/
 
 MAKEDEPEND = gcc -MM
 CC = gcc
 
 ifeq ($(BUILD_TARGET),BUILD_GTK)
 
-CFLAGS := -D$(BUILD_TARGET) -DWXFTP_HELP_DIR=\"$(WXFTP_HELP_DIR)\" \
-          -O2 -Wall -g `gtk-config --cflags`
-LFLAGS := `gtk-config --libs`
+CFLAGS += -D$(BUILD_TARGET) -DWXFTP_HELP_DIR=\"$(WXFTP_HELP_DIR)\" \
+          -Wall -g `gtk12-config --cflags`
+LFLAGS := `gtk12-config --libs`
 
 else
 
 LIBXBAEA = ../Xbae/libXbae.a
-LIBXMA = /usr/X11R6/lib/libXm.a
-LIBXM  = -L/usr/X11R6/lib -lXm
+LIBXMA = ${X11BASE}/lib/libXm.a
+LIBXM  = -L${X11BASE}/lib/ -lXm
 
-CFLAGS = -D$(BUILD_TARGET) -O2 -Wall -g -I/usr/X11R6/include/ -I../
-LFLAGS = -L/usr/X11R6/lib/ -lXp -lXt -lXext -lX11 -lXpm
+CFLAGS += -D$(BUILD_TARGET) -Wall -g -I${X11BASE}/include/ -I../
+LFLAGS = -L${X11BASE}/lib/ -lXp -lXt -lXext -lX11 -lXpm
 
 endif
 
@@ -52,14 +52,14 @@
 
 ifeq ($(BUILD_TARGET),BUILD_GTK)
 
-  GTK_MAJOR := $(shell gtk-config --version | cut -f 1 -d .)
+  GTK_MAJOR := $(shell gtk12-config --version | cut -f 1 -d .)
   ifneq ($(GTK_MAJOR),1) 
     all:	
-	@echo Does not support this gtk+ version: `gtk-config --version`
+	@echo Does not support this gtk+ version: `gtk12-config --version`
 	@false
   else
 
-    GTK_MINOR := $(shell gtk-config --version | cut -f 2 -d .)
+    GTK_MINOR := $(shell gtk12-config --version | cut -f 2 -d .)
 
     ifeq ($(GTK_MINOR),0)
       CFLAGS += -DOLD_GTK
@@ -70,7 +70,7 @@
         all:		wf
       else 
         all:
-	@echo Does not support this gtk+ version: `gtk-config --version`
+	@echo Does not support this gtk+ version: `gtk12-config --version`
 	@false
       endif
     endif
