--- texlive-2007/texk/dvipdfm/Makefile.in.orig	2007-06-21 23:25:47.867060404 -0400
+++ texlive-2007/texk/dvipdfm/Makefile.in	2007-06-21 23:25:59.583267073 -0400
@@ -5,12 +5,12 @@
 ZLIBDIR=../../libs/zlib
 ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
 ZLIBDEP = @ZLIBDEP@
-LDZLIB = @LDZLIB@
+LDZLIB = -lz
 
 LIBPNGDIR=../../libs/libpng
 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
 LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
+LDLIBPNG = -lpng
 
 LD_ALL_LIBS = $(LDLIBPNG) $(LDZLIB)
 ALL_LIBS_DEP = $(ZLIBDEP) $(LIBPNGDEP)
--- texlive-2007/texk/dvipdfmx/src/Makefile.am.orig	2007-06-21 23:26:55.466944358 -0400
+++ texlive-2007/texk/dvipdfmx/src/Makefile.am	2007-06-21 23:27:27.618279454 -0400
@@ -26,12 +26,12 @@
 LIBPNGDIR=$(top_builddir)/../../libs/libpng
 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
 LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
+LDLIBPNG = -lpng
 
 ZLIBDIR=$(top_builddir)/../../libs/zlib
 ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
 ZLIBDEP = @ZLIBDEP@
-LDZLIB = @LDZLIB@
+LDZLIB = -lz
 
 dvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@
 dvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB)
--- texlive-2007/texk/dvipdfmx/src/Makefile.in.orig	2007-06-21 23:27:04.401814280 -0400
+++ texlive-2007/texk/dvipdfmx/src/Makefile.in	2007-06-21 23:27:15.744110267 -0400
@@ -127,8 +127,8 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
-LDLIBPNG = @LDLIBPNG@
-LDZLIB = @LDZLIB@
+LDLIBPNG = -lpng
+LDZLIB = -lz
 LIBOBJS = @LIBOBJS@
 LIBPNGCPPFLAGS = @LIBPNGCPPFLAGS@
 LIBPNGDEP = @LIBPNGDEP@
--- texlive-2007/texk/dvipng/Makefile.in.orig	2007-06-21 23:27:57.119246384 -0400
+++ texlive-2007/texk/dvipng/Makefile.in	2007-06-21 23:30:16.123107489 -0400
@@ -27,21 +27,21 @@
 
 FREETYPE2DIR = ../../libs/freetype2
 FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR)
-FREETYPE2CPPFLAGS = @FREETYPE2CPPFLAGS@
+FREETYPE2CPPFLAGS = -I/usr/include/freetype2
 FREETYPE2DEP = @FREETYPE2DEP@
-LDFREETYPE2 = @LDFREETYPE2@
+LDFREETYPE2 = -lfreetype
 
 GDDIR=../../libs/gd
 GDSRCDIR=$(srcdir)/$(GDDIR)
 GDCPPFLAGS = @GDCPPFLAGS@
 GDDEP = @GDDEP@
-LDGD = @LDGD@
+LDGD = -lgd
 
 LIBT1DIR=../../libs/t1lib
 LIBT1SRCDIR=$(srcdir)/$(LIBT1DIR)
 LIBT1CPPFLAGS = @LIBT1CPPFLAGS@
 LIBT1DEP = @LIBT1DEP@
-LDLIBT1 = @LDLIBT1@
+LDLIBT1 = -lt1
 
 LIBPNGDIR=../../libs/libpng
 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
--- texlive-2007/texk/xdvik/Makefile.in.orig	2007-06-21 23:30:35.921387503 -0400
+++ texlive-2007/texk/xdvik/Makefile.in	2007-06-21 23:30:48.634356678 -0400
@@ -33,7 +33,7 @@
 # Xmu needs to come before Xt and after the toolkit libs.
 x_link = $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
 
-LDLIBT1=@LDLIBT1@
+LDLIBT1=-lt1
 LIBT1CPPFLAGS=@LIBT1CPPFLAGS@
 LIBT1DEP=@LIBT1DEP@
 LIBT1DIR = ../../libs/t1lib
--- texlive-2007/texk/xdvipdfmx/src/Makefile.am.orig	2007-06-21 23:33:10.099630612 -0400
+++ texlive-2007/texk/xdvipdfmx/src/Makefile.am	2007-06-21 23:33:32.330330672 -0400
@@ -27,7 +27,7 @@
 LIBPNGDIR=$(top_builddir)/../../libs/libpng
 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
 LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
+LDLIBPNG = -lpng
 
 ZLIBDIR=$(top_builddir)/../../libs/zlib
 ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
@@ -39,7 +39,7 @@
 LDFREETYPE2 = @LDFREETYPE2@
 FREETYPE2DEP = @FREETYPE2DEP@
 
-xdvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ @FREETYPE2CPPFLAGS@
-xdvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) $(LDFREETYPE2)
+xdvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ -I/usr/include/freetype2
+xdvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) -lfreetype
 xdvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP) $(FREETYPE2DEP)
 xdvipdfmx_LDFLAGS = @xdvipdfmx_LDFLAGS@
--- texlive-2007/texk/xdvipdfmx/src/Makefile.in.orig	2007-11-22 09:47:37.000000000 +0000
+++ texlive-2007/texk/xdvipdfmx/src/Makefile.in	2008-01-14 08:27:54.000000000 +0000
@@ -147,7 +147,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LDFREETYPE2 = @LDFREETYPE2@
-LDLIBPNG = @LDLIBPNG@
+LDLIBPNG = -lpng
 LDZLIB = @LDZLIB@
 LIBOBJS = @LIBOBJS@
 LIBPNGCPPFLAGS = @LIBPNGCPPFLAGS@
@@ -252,8 +252,8 @@
 ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR)
 FREETYPE2DIR = $(top_builddir)/../../libs/freetype2
 FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR)
-xdvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ @FREETYPE2CPPFLAGS@
-xdvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) $(LDFREETYPE2)
+xdvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ -I/usr/include/freetype2
+xdvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) -lfreetype
 xdvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP) $(FREETYPE2DEP)
 all: all-am