diff --git a/Makefile.dynamic.in b/Makefile.dynamic.in
index 45da3c4..3273814 100644
--- a/Makefile.dynamic.in
+++ b/Makefile.dynamic.in
@@ -129,8 +129,8 @@ install: $(DESTDIR)$(sharedir) all install_libs install_incs install_po install_
 # You may need to be root to do the install
 #explicit use of sh to make sure we don't invoke csh with different "if" syntax
 	sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
-	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
-	sh < systemspecific
+#	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
+#	sh < systemspecific
 #we don't always create a setup.py
 	-(cd pyhook ; if test -r setup.py ; then python setup.py install --prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done ; fi )
 
@@ -138,8 +138,8 @@ install_py: $(DESTDIR)$(sharedir) all install_libs install_incs install_po insta
 # You may need to be root to do the install
 #explicit use of sh to make sure we don't invoke csh with different "if" syntax
 	sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; for dir in * ; do if test -d $$dir ; then  rm -rf $$dir ; fi; done ; fi"
-	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
-	sh < systemspecific
+#	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
+#	sh < systemspecific
 	-(cd pyhook ; python setup.py bdist --formats=gztar ; cp dist/fontforge-*.tar.gz $(DESTDIR)/tmp; for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done )
 
 install_gtk: fontforgegtk
diff --git a/Unicode/Makefile.dynamic.in b/Unicode/Makefile.dynamic.in
index 50ce7e7..de425d3 100644
--- a/Unicode/Makefile.dynamic.in
+++ b/Unicode/Makefile.dynamic.in
@@ -20,8 +20,8 @@ libgunicode_OBJECTS =  ArabicForms.lo alphabet.lo backtrns.lo char.lo \
  cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \
  usprintf.lo gwwiconv.lo
 
-Incs = -I$(top_srcdir)/inc -I../inc -I/usr/pkg/include -I/usr/pkg/include/giflib
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
+Incs = -I$(top_srcdir)/inc -I../inc
+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ @DEFS@
 
 ../libgunicode.la: $(libgunicode_OBJECTS)
 	$(LIBTOOL) --mode=link $(CC) -no-undefined @LDFLAGS@ -o ../libgunicode.la $(libgunicode_OBJECTS) \
diff --git a/configure b/configure
index 5a670b1..8a1813a 100755
--- a/configure
+++ b/configure
@@ -4307,7 +4307,7 @@ fi
 oldCPPFLAGS="$CPPFLAGS"
 gww_extraincludes=""
 oldLDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+#LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 case "$host" in
 *-apple-darwin*)
diff --git a/fontforge/Makefile.dynamic.in b/fontforge/Makefile.dynamic.in
index 08a5c69..25a870e 100644
--- a/fontforge/Makefile.dynamic.in
+++ b/fontforge/Makefile.dynamic.in
@@ -70,12 +70,12 @@ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(_CFLAGS)
 
 #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles
 LDFLAGS = $(X_LIBS) @LDFLAGS@
-LIBS = -rpath $(libdir) @LINK_WITH_GDRAW@ ../libgutils.la \
-    ../libgunicode.la \
-    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
-LIBLIBS = -rpath $(libdir) ../libgutils.la ../libgunicode.la \
-    @LIBS@ $(STATIC_LIBS) -lm
-DLIBS = -rpath $(libdir)  ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
+LIBS = -rpath $(libdir) $(STATIC_LIBS) @LINK_WITH_GDRAW@ ../libgunicode.la \
+    ../libgutils.la \
+    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ -lm
+LIBLIBS = -rpath $(libdir) $(STATIC_LIBS) ../libgunicode.la ../libgutils.la \
+    @LIBS@ -lm
+DLIBS = -rpath $(libdir) $(STATIC_LIBS) ../libgunicode.la ../libgutils.la ../libfontforge.la @LIBS@ -lm
 
 all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint
 
diff --git a/fontforge/start.c b/fontforge/start.c
index 2da6708..a9b1303 100644
--- a/fontforge/start.c
+++ b/fontforge/start.c
@@ -125,7 +125,6 @@ static void initlibrarysearchpath(void) {
     /*  install image libs. For some reason fink installs in a place */
     /*  the dynamic loader doesn't find */
     /* (And fink's attempts to set the PATH variables generally don't work */
-    setenv("DYLD_LIBRARY_PATH","/sw/lib",0);
 #endif
 }
 
diff --git a/gdraw/Makefile.dynamic.in b/gdraw/Makefile.dynamic.in
index 32986c4..20c2c7e 100644
--- a/gdraw/Makefile.dynamic.in
+++ b/gdraw/Makefile.dynamic.in
@@ -36,12 +36,12 @@ libgdraw_OBJECTS =  choosericons.lo ctlvalues.lo drawboxborder.lo \
  gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo gxcdraw.lo \
  ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo xkeysyms_unicode.lo
 
-Incs = -I$(top_srcdir)/inc -I../inc -I/usr/pkg/include -I/usr/pkg/include/giflib
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"'
+Incs = -I$(top_srcdir)/inc -I../inc
+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"'
 
 ../libgdraw.la: $(libgdraw_OBJECTS)
 	$(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -o ../libgdraw.la $(libgdraw_OBJECTS) \
-	    ../libgutils.la ../libgunicode.la $(X_LIBS) @LDFLAGS@ @LIBS@ \
+	    ../libgunicode.la ../libgutils.la $(X_LIBS) @LDFLAGS@ @LIBS@ \
 	    $(STATIC_LIBS) $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS)  \
 	    -rpath $(libdir) -version-info $(GD_VERSION):$(GD_REVISION):$(GD_AGE)
 
diff --git a/gutils/Makefile.dynamic.in b/gutils/Makefile.dynamic.in
index ce685be..7d305d2 100644
--- a/gutils/Makefile.dynamic.in
+++ b/gutils/Makefile.dynamic.in
@@ -32,21 +32,19 @@ libgutils_OBJECTS = divisors.lo fsys.lo gcol.lo gimage.lo gimagereadbmp.lo \
  gio.lo giofile.lo giohosts.lo giomime.lo giothread.lo giotrans.lo
 libgioftp_OBJECTS = gioftp.lo
 
-Incs = -I$(top_srcdir)/inc -I../inc -I/usr/pkg/include -I/usr/pkg/include/giflib
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"'
+Incs = -I$(top_srcdir)/inc -I../inc
+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@ -DLIBDIR='"$(libdir)"'
 
 both: ../libgutils.la ../libgioftp.la
 
 ../libgutils.la: $(libgutils_OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) @LDFLAGS@ -o ../libgutils.la $(libgutils_OBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) $(STATIC_LIBS) @LDFLAGS@ -o ../libgutils.la $(libgutils_OBJECTS) \
 	    ../libgunicode.la @LIBS@ \
-	    $(STATIC_LIBS)  \
 	    -rpath $(libdir) -version-info $(GU_VERSION):$(GU_REVISION):$(GU_AGE)
 
 ../libgioftp.la: $(libgioftp_OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) @LDFLAGS@ -o ../libgioftp.la $(libgioftp_OBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) $(STATIC_LIBS) @LDFLAGS@ -o ../libgioftp.la $(libgioftp_OBJECTS) \
 	    ../libgunicode.la @LIBS@ \
-	    $(STATIC_LIBS)  \
 	    -rpath $(libdir) -version-info $(GFTP_VERSION):$(GFTP_REVISION):$(GFTP_AGE)
 
 %.lo: %.c