--- gftp-2.0.14/src/text/Makefile.am~	Sun Feb  9 23:44:18 2003
+++ gftp-2.0.14/src/text/Makefile.am	Sun Feb  9 23:44:18 2003
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = @GFTP_TEXT@
+bin_PROGRAMS = $(GFTP_TEXT)
 EXTRA_PROGRAMS = gftp-text
 gftp_text_SOURCES=gftp-text.c 
-INCLUDES=@GLIB_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl
-LDADD = ../../lib/libgftp.a @LIBINTL@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@
+INCLUDES = $(GLIB_CFLAGS) -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl
+LDADD = ../../lib/libgftp.a $(INTLLIBS) $(GLIB_LIBS) $(EXTRA_LIBS) $(READLINE_LIBS)
 noinst_HEADERS=gftp-text.h
 localedir=$(datadir)/locale
--- gftp-2.0.14/src/gtk/Makefile.am~	Sun Feb  9 23:46:32 2003
+++ gftp-2.0.14/src/gtk/Makefile.am	Sun Feb  9 23:46:32 2003
@@ -1,11 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = @GFTP_GTK@
+bin_PROGRAMS = $(GFTP_GTK)
 EXTRA_PROGRAMS = gftp-gtk
 gftp_gtk_SOURCES = bookmarks.c chmod_dialog.c delete_dialog.c dnd.c \
                      gftp-gtk.c menu-items.c misc-gtk.c mkdir_dialog.c \
                      options_dialog.c rename_dialog.c transfer.c view_dialog.c
-INCLUDES = @GTK_CFLAGS@ @PTHREAD_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl
-LDADD = ../../lib/libgftp.a @LIBINTL@ @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ @GTHREAD_LIBS@
+INCLUDES = $(GTK_CFLAGS) $(PTHREAD_CFLAGS) -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl
+LDADD = ../../lib/libgftp.a $(INTLLIBS) $(GTK_LIBS) $(PTHREAD_LIBS) $(EXTRA_LIBS) $(GTHREAD_LIBS)
 noinst_HEADERS = gftp-gtk.h
 localedir = $(datadir)/locale