--- makefile.orig	2011-05-20 15:31:46.000000000 -0400
+++ makefile	2013-08-25 00:11:09.000000000 -0400
@@ -39,7 +39,6 @@
 endif
 
 # defaults
-CC = gcc
 OPTIONS=-g -Wall $(ENC_OPTS)
 LDLIBS=-lc -lm $(CRYPT_LIB)
 CFLAGS=
@@ -51,7 +50,7 @@
 
 # OSX, aka Darwin
 ifeq ("Darwin", "$(UNAME_S)")
-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
+OPTIONS+=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
 endif
 
 # Sun
@@ -71,8 +70,8 @@
 endif
 
 ifdef OPENSSL
-INCLUDE=-I $(OPENSSL)/include
-LIB=-L $(OPENSSL)/lib
+INCLUDE=-I$(OPENSSL)/include
+LIB=-L$(OPENSSL)/lib
 endif
 
 all: uftp uftpd uftpproxyd uftp_keymgt
@@ -191,12 +190,9 @@
 	$(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) -c $<
 
 install:
-	install -m 755 -d $(DESTDIR)/bin
-	install -m 755 -d $(DESTDIR)/usr/sbin
-	install -m 755 -d $(DESTDIR)/usr/share/man/man1
 	/bin/cp -p uftp $(DESTDIR)/bin
-	/bin/cp -p uftpd $(DESTDIR)/usr/sbin
-	/bin/cp -p uftpproxyd $(DESTDIR)/usr/sbin
+	/bin/cp -p uftpd $(DESTDIR)/sbin
+	/bin/cp -p uftpproxyd $(DESTDIR)/sbin
 	/bin/cp -p uftp_keymgt $(DESTDIR)/bin
-	/bin/cp -p uftp.1 uftpd.1 uftpproxyd.1 uftp_keymgt.1 $(DESTDIR)/usr/share/man/man1
+	/bin/cp -p uftp.1 uftpd.1 uftpproxyd.1 uftp_keymgt.1 $(DESTDIR)/share/man/man1