--- Makefile.orig	Thu Apr 15 11:05:15 1999
+++ Makefile	Fri May 28 18:43:37 1999
@@ -1,14 +1,15 @@
 SHELL=/bin/sh
-CC = gcc
-C_FLAGS = -Wall -g -O2 -m486 -fno-strength-reduce
-GTK_CFLAGS = `gtk-config --cflags`
-GTK_LIBS = `gtk-config --libs` 
-LFLAGS = $(GTK_LIBS) -lresolv -lXmu -lXt -lSM -lICE
+CC?= gcc
+C_FLAGS = $(CFLAGS)
+# -Wall -g -O2 -m486 -fno-strength-reduce
+GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
+GTK_LIBS = `$(GTK_CONFIG) --libs` 
+LFLAGS = $(GTK_LIBS) -lXmu -lXt -lSM -lICE
 PROGNAME = IglooFTP
 PROGNAME-STATIC = IglooFTP-static
 VERSION = 0.6.1
 VERSION_DATE = 1999
-DESTDIR = /usr/local
+DESTDIR?= ${PREFIX}
 BIN_PATH = $(DESTDIR)/bin
 MAN_PATH = $(DESTDIR)/man
 SHARE_PATH = $(DESTDIR)/share/$(PROGNAME)
@@ -16,6 +17,8 @@
 RPM_BUILDPATH = /usr/src/redhat
 CODE_LINES = `cat *.c *.h | grep -ch -e "[[:alpha:]|[:punct:]]"` 
 
+all: $(PROGNAME)
+
 $(PROGNAME): main.o GTKmisc.o menu.o toolbar.o connectbar.o statusbar.o\
 	dirlist.o ftplist.o queue.o log.o console.o dialog.o chmod.o\
 	version.o custom.o string.o pixmaps.o color.o cursor.o\
@@ -50,14 +53,14 @@
 	@if ! test -e $(SHARE_PATH)/app_ass; then \
 	echo "Making $(SHARE_PATH)/app_ass directory ..."; mkdir -m 0755 $(SHARE_PATH)/app_ass; \
 	else :; fi;
-	/usr/bin/install -s -m 755 $(PROGNAME) $(BIN_PATH)
-	/usr/bin/install -m 644 ../share/docs/* $(SHARE_PATH)/docs/
-	/usr/bin/install -m 644 ../share/html/*.* $(SHARE_PATH)/html/
-	/usr/bin/install -m 644 ../share/html/images/*.* $(SHARE_PATH)/html/images/
-	/usr/bin/install -m 644 ../share/xpm/* $(SHARE_PATH)/xpm/
-	/usr/bin/install -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
-	/usr/bin/install -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/
-	/usr/bin/install -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc	
+	${BSD_INSTALL_PROGRAM} $(PROGNAME) $(BIN_PATH)
+	${BSD_INSTALL_DATA} ../share/docs/* $(SHARE_PATH)/docs/
+	${BSD_INSTALL_DATA} ../share/html/*.* $(SHARE_PATH)/html/
+	${BSD_INSTALL_DATA} ../share/html/images/*.* $(SHARE_PATH)/html/images/
+	${BSD_INSTALL_DATA} ../share/xpm/* $(SHARE_PATH)/xpm/
+	${BSD_INSTALL_DATA} ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
+	${BSD_INSTALL_DATA} ../share/app_ass/* $(SHARE_PATH)/app_ass/
+	${BSD_INSTALL_DATA} ../share/gtkrc $(SHARE_PATH)/gtkrc	
 
 
 
@@ -111,7 +114,7 @@
 	@echo "#define COMPILE_TIME \"`date +%T`\"" >> version.h
 	@echo "#define COMPILE_BY \"`whoami`\"" >> version.h
 	@echo "#define COMPILE_HOST \"`hostname`\"" >> version.h
-	@echo "#define GTK_VERSION \"GTK+ `gtk-config --version`\"" >> version.h
+	@echo "#define GTK_VERSION \"GTK+ `$(GTK_CONFIG) --version`\"" >> version.h
 	@echo "#define CC_VERSION \"`$(CC) -v 2>&1 | tail -1`\"">>version.h
 	@echo "#define CODE_LINES \"`cat *.c *.h | grep -ch -e \"[[:alpha:]|[:punct:]]\"`\"">>version.h