diff -uNr graphviz-2.2-orig/agraph/libagraph.pc.in graphviz-2.2/agraph/libagraph.pc.in
--- graphviz-2.2-orig/agraph/libagraph.pc.in	2004-07-26 20:52:05 +0400
+++ graphviz-2.2/agraph/libagraph.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libagraph
 Description: Graph library (file i/o, dot language parsing, graph, subgraph, node, edge, attribute, data structure manipulation)
 Version: @VERSION@
-Libs: -L${libdir} -lagraph -lcdt
+Libs: -lagraph -lcdt
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/agraph/Makefile.in graphviz-2.2/agraph/Makefile.in
--- graphviz-2.2-orig/agraph/Makefile.in	2005-01-20 00:00:27 +0300
+++ graphviz-2.2/agraph/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/agutil/Makefile.in graphviz-2.2/agutil/Makefile.in
--- graphviz-2.2-orig/agutil/Makefile.in	2005-01-20 00:00:28 +0300
+++ graphviz-2.2/agutil/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/cdt/libcdt.pc.in graphviz-2.2/cdt/libcdt.pc.in
--- graphviz-2.2-orig/cdt/libcdt.pc.in	2004-07-26 20:52:06 +0400
+++ graphviz-2.2/cdt/libcdt.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libcdt
 Description: Container DataType library
 Version: @VERSION@
-Libs: -L${libdir} -lcdt
+Libs: -lcdt
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/cdt/Makefile.in graphviz-2.2/cdt/Makefile.in
--- graphviz-2.2-orig/cdt/Makefile.in	2005-01-20 00:00:29 +0300
+++ graphviz-2.2/cdt/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/contrib/Makefile.in graphviz-2.2/contrib/Makefile.in
--- graphviz-2.2-orig/contrib/Makefile.in	2005-01-20 00:00:29 +0300
+++ graphviz-2.2/contrib/Makefile.in	2005-02-13 20:37:08 +0300
@@ -17,7 +17,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/contrib/prune/Makefile.in graphviz-2.2/contrib/prune/Makefile.in
--- graphviz-2.2-orig/contrib/prune/Makefile.in	2005-01-20 00:00:30 +0300
+++ graphviz-2.2/contrib/prune/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/doc/info/Makefile.in graphviz-2.2/doc/info/Makefile.in
--- graphviz-2.2-orig/doc/info/Makefile.in	2005-01-20 00:00:31 +0300
+++ graphviz-2.2/doc/info/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/doc/Makefile.in graphviz-2.2/doc/Makefile.in
--- graphviz-2.2-orig/doc/Makefile.in	2005-01-20 00:00:31 +0300
+++ graphviz-2.2/doc/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/circogen/libcircogen.pc.in graphviz-2.2/dotneato/circogen/libcircogen.pc.in
--- graphviz-2.2-orig/dotneato/circogen/libcircogen.pc.in	2004-08-13 02:29:41 +0400
+++ graphviz-2.2/dotneato/circogen/libcircogen.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
 
 Name: libcircogen
 Description: Circular layout library
 Version: @VERSION@
-Libs: -L${libdir} -lcircogen
+Libs: -lcircogen
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/circogen/Makefile.in graphviz-2.2/dotneato/circogen/Makefile.in
--- graphviz-2.2-orig/dotneato/circogen/Makefile.in	2005-01-20 00:00:33 +0300
+++ graphviz-2.2/dotneato/circogen/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/common/libcommon.pc.in graphviz-2.2/dotneato/common/libcommon.pc.in
--- graphviz-2.2-orig/dotneato/common/libcommon.pc.in	2004-07-28 06:13:13 +0400
+++ graphviz-2.2/dotneato/common/libcommon.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libcommon
 Description: Various renderers and other routines common to all layout engines.
 Version: @VERSION@
-Libs: -L${libdir} -lcommon
+Libs: -lcommon
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/common/Makefile.in graphviz-2.2/dotneato/common/Makefile.in
--- graphviz-2.2-orig/dotneato/common/Makefile.in	2005-01-20 00:00:34 +0300
+++ graphviz-2.2/dotneato/common/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/dotgen/libdotgen.pc.in graphviz-2.2/dotneato/dotgen/libdotgen.pc.in
--- graphviz-2.2-orig/dotneato/dotgen/libdotgen.pc.in	2004-08-13 02:29:42 +0400
+++ graphviz-2.2/dotneato/dotgen/libdotgen.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
 
 Name: libdotgen
 Description: Directed layout library
 Version: @VERSION@
-Libs: -L${libdir} -ldotgen
+Libs: -ldotgen
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/dotgen/Makefile.in graphviz-2.2/dotneato/dotgen/Makefile.in
--- graphviz-2.2-orig/dotneato/dotgen/Makefile.in	2005-01-20 00:00:34 +0300
+++ graphviz-2.2/dotneato/dotgen/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/dotneato-config.in graphviz-2.2/dotneato/dotneato-config.in
--- graphviz-2.2-orig/dotneato/dotneato-config.in	2004-07-28 06:13:13 +0400
+++ graphviz-2.2/dotneato/dotneato-config.in	2005-02-13 20:37:08 +0300
@@ -2,7 +2,7 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-pkglibdir=@libdir@/@PACKAGE@
+pkglibdir=@libdir@
 includedir=@includedir@
 pkgincludedir=${includedir}/@PACKAGE@
 
@@ -94,7 +94,7 @@
 fi
 
 if test "$echo_ldflags" = "yes" ; then
- echo "-L$pkglibdir"
+ echo ""
 fi
 
 if test "$echo_libs" = "yes" ; then
@@ -106,7 +106,7 @@
 fi
 
 if test "$echo_libtool" = "yes" ; then
- echo "$pkglibdir/libdotneato.la"
+ echo "$pkglibdir/libdotneato.so"
 fi
 
 # EOF
diff -uNr graphviz-2.2-orig/dotneato/fdpgen/libfdpgen.pc.in graphviz-2.2/dotneato/fdpgen/libfdpgen.pc.in
--- graphviz-2.2-orig/dotneato/fdpgen/libfdpgen.pc.in	2004-07-28 06:13:13 +0400
+++ graphviz-2.2/dotneato/fdpgen/libfdpgen.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libfdpgen
 Description: Force Directed Placement layout library
 Version: @VERSION@
-Libs: -L${libdir} -lfdpgen
+Libs: -lfdpgen
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/fdpgen/Makefile.in graphviz-2.2/dotneato/fdpgen/Makefile.in
--- graphviz-2.2-orig/dotneato/fdpgen/Makefile.in	2005-01-20 00:00:35 +0300
+++ graphviz-2.2/dotneato/fdpgen/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/gvrender/libgvrender.pc.in graphviz-2.2/dotneato/gvrender/libgvrender.pc.in
--- graphviz-2.2-orig/dotneato/gvrender/libgvrender.pc.in	2004-07-28 06:13:13 +0400
+++ graphviz-2.2/dotneato/gvrender/libgvrender.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libgvrender
 Description: Graphviz rendering library for plugin renderers
 Version: @VERSION@
-Libs: -L${libdir} -lgvrender
+Libs: -lgvrender
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/gvrender/Makefile.in graphviz-2.2/dotneato/gvrender/Makefile.in
--- graphviz-2.2-orig/dotneato/gvrender/Makefile.in	2005-01-20 00:00:36 +0300
+++ graphviz-2.2/dotneato/gvrender/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/gvre_svg/Makefile.in graphviz-2.2/dotneato/gvre_svg/Makefile.in
--- graphviz-2.2-orig/dotneato/gvre_svg/Makefile.in	2005-01-20 00:00:36 +0300
+++ graphviz-2.2/dotneato/gvre_svg/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/libdotneato.pc.in graphviz-2.2/dotneato/libdotneato.pc.in
--- graphviz-2.2-orig/dotneato/libdotneato.pc.in	2004-07-28 06:13:13 +0400
+++ graphviz-2.2/dotneato/libdotneato.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libdotneato
 Description: All graph layout engines in a single library
 Version: @VERSION@
-Libs: -L${libdir} -ldotneato
+Libs: -ldotneato
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/Makefile.in graphviz-2.2/dotneato/Makefile.in
--- graphviz-2.2-orig/dotneato/Makefile.in	2005-01-20 00:00:32 +0300
+++ graphviz-2.2/dotneato/Makefile.in	2005-02-13 20:37:08 +0300
@@ -24,7 +24,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/neatogen/libneatogen.pc.in graphviz-2.2/dotneato/neatogen/libneatogen.pc.in
--- graphviz-2.2-orig/dotneato/neatogen/libneatogen.pc.in	2004-08-13 02:29:42 +0400
+++ graphviz-2.2/dotneato/neatogen/libneatogen.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
 
 Name: libneatogen
 Description: Undirected layout library
 Version: @VERSION@
-Libs: -L${libdir} -lneatogen
+Libs: -lneatogen
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/neatogen/Makefile.in graphviz-2.2/dotneato/neatogen/Makefile.in
--- graphviz-2.2-orig/dotneato/neatogen/Makefile.in	2005-01-20 00:00:37 +0300
+++ graphviz-2.2/dotneato/neatogen/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/pack/libpack.pc.in graphviz-2.2/dotneato/pack/libpack.pc.in
--- graphviz-2.2-orig/dotneato/pack/libpack.pc.in	2004-07-26 20:52:08 +0400
+++ graphviz-2.2/dotneato/pack/libpack.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libpack
 Description: Graph layout packer library
 Version: @VERSION@
-Libs: -L${libdir} -lcommon -lgvrender -lpack -lgraph -lcdt
+Libs: -lcommon -lgvrender -lpack -lgraph -lcdt
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/pack/Makefile.in graphviz-2.2/dotneato/pack/Makefile.in
--- graphviz-2.2-orig/dotneato/pack/Makefile.in	2005-01-20 00:00:38 +0300
+++ graphviz-2.2/dotneato/pack/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotneato/twopigen/libtwopigen.pc.in graphviz-2.2/dotneato/twopigen/libtwopigen.pc.in
--- graphviz-2.2-orig/dotneato/twopigen/libtwopigen.pc.in	2004-08-13 02:29:42 +0400
+++ graphviz-2.2/dotneato/twopigen/libtwopigen.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
 
 Name: libtwopigen
 Description: Circular layout library
 Version: @VERSION@
-Libs: -L${libdir} -ltwopigen
+Libs: -ltwopigen
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/dotneato/twopigen/Makefile.in graphviz-2.2/dotneato/twopigen/Makefile.in
--- graphviz-2.2-orig/dotneato/twopigen/Makefile.in	2005-01-20 00:00:38 +0300
+++ graphviz-2.2/dotneato/twopigen/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dotty/Makefile.in graphviz-2.2/dotty/Makefile.in
--- graphviz-2.2-orig/dotty/Makefile.in	2005-01-20 00:00:39 +0300
+++ graphviz-2.2/dotty/Makefile.in	2005-02-13 20:37:08 +0300
@@ -19,7 +19,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dynagraph/common/Makefile.in graphviz-2.2/dynagraph/common/Makefile.in
--- graphviz-2.2-orig/dynagraph/common/Makefile.in	2005-01-20 00:00:40 +0300
+++ graphviz-2.2/dynagraph/common/Makefile.in	2005-02-13 20:37:08 +0300
@@ -23,7 +23,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dynagraph/dynadag/Makefile.in graphviz-2.2/dynagraph/dynadag/Makefile.in
--- graphviz-2.2-orig/dynagraph/dynadag/Makefile.in	2005-01-20 00:00:41 +0300
+++ graphviz-2.2/dynagraph/dynadag/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dynagraph/fdp/Makefile.in graphviz-2.2/dynagraph/fdp/Makefile.in
--- graphviz-2.2-orig/dynagraph/fdp/Makefile.in	2005-01-20 00:00:42 +0300
+++ graphviz-2.2/dynagraph/fdp/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dynagraph/graphsearch/Makefile.in graphviz-2.2/dynagraph/graphsearch/Makefile.in
--- graphviz-2.2-orig/dynagraph/graphsearch/Makefile.in	2005-01-20 00:00:42 +0300
+++ graphviz-2.2/dynagraph/graphsearch/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dynagraph/incrface/Makefile.in graphviz-2.2/dynagraph/incrface/Makefile.in
--- graphviz-2.2-orig/dynagraph/incrface/Makefile.in	2005-01-20 00:00:43 +0300
+++ graphviz-2.2/dynagraph/incrface/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dynagraph/Makefile.in graphviz-2.2/dynagraph/Makefile.in
--- graphviz-2.2-orig/dynagraph/Makefile.in	2005-01-20 00:00:40 +0300
+++ graphviz-2.2/dynagraph/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dynagraph/shortspline/Makefile.in graphviz-2.2/dynagraph/shortspline/Makefile.in
--- graphviz-2.2-orig/dynagraph/shortspline/Makefile.in	2005-01-20 00:00:44 +0300
+++ graphviz-2.2/dynagraph/shortspline/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/dynagraph/voronoi/Makefile.in graphviz-2.2/dynagraph/voronoi/Makefile.in
--- graphviz-2.2-orig/dynagraph/voronoi/Makefile.in	2005-01-20 00:00:44 +0300
+++ graphviz-2.2/dynagraph/voronoi/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/gd/config/Makefile.in graphviz-2.2/gd/config/Makefile.in
--- graphviz-2.2-orig/gd/config/Makefile.in	2003-04-10 07:51:59 +0400
+++ graphviz-2.2/gd/config/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
diff -uNr graphviz-2.2-orig/gd/Makefile.in graphviz-2.2/gd/Makefile.in
--- graphviz-2.2-orig/gd/Makefile.in	2005-01-20 00:00:45 +0300
+++ graphviz-2.2/gd/Makefile.in	2005-02-13 20:37:08 +0300
@@ -23,7 +23,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/gd/test/Makefile.in graphviz-2.2/gd/test/Makefile.in
--- graphviz-2.2-orig/gd/test/Makefile.in	2004-06-16 23:25:06 +0400
+++ graphviz-2.2/gd/test/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
diff -uNr graphviz-2.2-orig/gdtclft/demo/Makefile.in graphviz-2.2/gdtclft/demo/Makefile.in
--- graphviz-2.2-orig/gdtclft/demo/Makefile.in	2005-01-20 00:00:47 +0300
+++ graphviz-2.2/gdtclft/demo/Makefile.in	2005-02-13 20:37:08 +0300
@@ -19,7 +19,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/gdtclft/Makefile.in graphviz-2.2/gdtclft/Makefile.in
--- graphviz-2.2-orig/gdtclft/Makefile.in	2005-01-20 00:00:46 +0300
+++ graphviz-2.2/gdtclft/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/graph/libgraph.pc.in graphviz-2.2/graph/libgraph.pc.in
--- graphviz-2.2-orig/graph/libgraph.pc.in	2004-07-26 20:52:10 +0400
+++ graphviz-2.2/graph/libgraph.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libgraph
 Description: Graph library (file i/o, dot language parsing, graph, subgraph, node, edge, attribute, data structure manipulation)
 Version: @VERSION@
-Libs: -L${libdir} -lgraph -lcdt
+Libs: -lgraph -lcdt
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/graph/Makefile.in graphviz-2.2/graph/Makefile.in
--- graphviz-2.2-orig/graph/Makefile.in	2005-01-20 00:00:48 +0300
+++ graphviz-2.2/graph/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/graphs/directed/Makefile.in graphviz-2.2/graphs/directed/Makefile.in
--- graphviz-2.2-orig/graphs/directed/Makefile.in	2005-01-20 00:00:49 +0300
+++ graphviz-2.2/graphs/directed/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/graphs/Makefile.in graphviz-2.2/graphs/Makefile.in
--- graphviz-2.2-orig/graphs/Makefile.in	2005-01-20 00:00:48 +0300
+++ graphviz-2.2/graphs/Makefile.in	2005-02-13 20:37:08 +0300
@@ -17,7 +17,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/graphs/undirected/Makefile.in graphviz-2.2/graphs/undirected/Makefile.in
--- graphviz-2.2-orig/graphs/undirected/Makefile.in	2005-01-20 00:00:49 +0300
+++ graphviz-2.2/graphs/undirected/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/cs2l/Makefile.in graphviz-2.2/lefty/cs2l/Makefile.in
--- graphviz-2.2-orig/lefty/cs2l/Makefile.in	2005-01-20 00:00:50 +0300
+++ graphviz-2.2/lefty/cs2l/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/dot2l/Makefile.in graphviz-2.2/lefty/dot2l/Makefile.in
--- graphviz-2.2-orig/lefty/dot2l/Makefile.in	2005-01-20 00:00:51 +0300
+++ graphviz-2.2/lefty/dot2l/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/examples/Makefile.in graphviz-2.2/lefty/examples/Makefile.in
--- graphviz-2.2-orig/lefty/examples/Makefile.in	2005-01-20 00:00:51 +0300
+++ graphviz-2.2/lefty/examples/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/Makefile.in graphviz-2.2/lefty/Makefile.in
--- graphviz-2.2-orig/lefty/Makefile.in	2005-01-20 00:00:50 +0300
+++ graphviz-2.2/lefty/Makefile.in	2005-02-13 20:37:08 +0300
@@ -23,7 +23,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/os/Makefile.in graphviz-2.2/lefty/os/Makefile.in
--- graphviz-2.2-orig/lefty/os/Makefile.in	2005-01-20 00:00:52 +0300
+++ graphviz-2.2/lefty/os/Makefile.in	2005-02-13 20:37:08 +0300
@@ -17,7 +17,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/os/unix/Makefile.in graphviz-2.2/lefty/os/unix/Makefile.in
--- graphviz-2.2-orig/lefty/os/unix/Makefile.in	2005-01-20 00:00:52 +0300
+++ graphviz-2.2/lefty/os/unix/Makefile.in	2005-02-13 20:37:08 +0300
@@ -20,7 +20,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/ws/Makefile.in graphviz-2.2/lefty/ws/Makefile.in
--- graphviz-2.2-orig/lefty/ws/Makefile.in	2005-01-20 00:00:53 +0300
+++ graphviz-2.2/lefty/ws/Makefile.in	2005-02-13 20:37:08 +0300
@@ -17,7 +17,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/ws/x11/libfilereq/Makefile.in graphviz-2.2/lefty/ws/x11/libfilereq/Makefile.in
--- graphviz-2.2-orig/lefty/ws/x11/libfilereq/Makefile.in	2005-01-20 00:00:54 +0300
+++ graphviz-2.2/lefty/ws/x11/libfilereq/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lefty/ws/x11/Makefile.in graphviz-2.2/lefty/ws/x11/Makefile.in
--- graphviz-2.2-orig/lefty/ws/x11/Makefile.in	2005-01-20 00:00:54 +0300
+++ graphviz-2.2/lefty/ws/x11/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/lneato/Makefile.in graphviz-2.2/lneato/Makefile.in
--- graphviz-2.2-orig/lneato/Makefile.in	2005-01-20 00:00:55 +0300
+++ graphviz-2.2/lneato/Makefile.in	2005-02-13 20:37:08 +0300
@@ -19,7 +19,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/ns/Makefile.in graphviz-2.2/ns/Makefile.in
--- graphviz-2.2-orig/ns/Makefile.in	2005-01-20 00:00:55 +0300
+++ graphviz-2.2/ns/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/pathplan/libpathplan.pc.in graphviz-2.2/pathplan/libpathplan.pc.in
--- graphviz-2.2-orig/pathplan/libpathplan.pc.in	2004-07-26 20:52:12 +0400
+++ graphviz-2.2/pathplan/libpathplan.pc.in	2005-02-13 20:37:08 +0300
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/@PACKAGE@
+libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
                                                                                        
 Name: libpathplan
 Description: Library for planning polyline and bezier paths around polygon obstacles
 Version: @VERSION@
-Libs: -L${libdir} -lpathplan
+Libs: -lpathplan
 Cflags: -I${includedir}
diff -uNr graphviz-2.2-orig/pathplan/Makefile.in graphviz-2.2/pathplan/Makefile.in
--- graphviz-2.2-orig/pathplan/Makefile.in	2005-01-20 00:00:56 +0300
+++ graphviz-2.2/pathplan/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tcldot/demo/Makefile.in graphviz-2.2/tcldot/demo/Makefile.in
--- graphviz-2.2-orig/tcldot/demo/Makefile.in	2005-01-20 00:00:57 +0300
+++ graphviz-2.2/tcldot/demo/Makefile.in	2005-02-13 20:37:08 +0300
@@ -19,7 +19,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tcldot/Makefile.in graphviz-2.2/tcldot/Makefile.in
--- graphviz-2.2-orig/tcldot/Makefile.in	2005-01-20 00:00:57 +0300
+++ graphviz-2.2/tcldot/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tclhandle/Makefile.in graphviz-2.2/tclhandle/Makefile.in
--- graphviz-2.2-orig/tclhandle/Makefile.in	2005-01-20 00:00:58 +0300
+++ graphviz-2.2/tclhandle/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tclpathplan/demo/Makefile.in graphviz-2.2/tclpathplan/demo/Makefile.in
--- graphviz-2.2-orig/tclpathplan/demo/Makefile.in	2005-01-20 00:00:59 +0300
+++ graphviz-2.2/tclpathplan/demo/Makefile.in	2005-02-13 20:37:08 +0300
@@ -19,7 +19,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tclpathplan/demo/pathplan_data/Makefile.in graphviz-2.2/tclpathplan/demo/pathplan_data/Makefile.in
--- graphviz-2.2-orig/tclpathplan/demo/pathplan_data/Makefile.in	2005-01-20 00:01:00 +0300
+++ graphviz-2.2/tclpathplan/demo/pathplan_data/Makefile.in	2005-02-13 20:37:08 +0300
@@ -18,7 +18,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tclpathplan/Makefile.in graphviz-2.2/tclpathplan/Makefile.in
--- graphviz-2.2-orig/tclpathplan/Makefile.in	2005-01-20 00:00:59 +0300
+++ graphviz-2.2/tclpathplan/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tclstubs/Makefile.in graphviz-2.2/tclstubs/Makefile.in
--- graphviz-2.2-orig/tclstubs/Makefile.in	2005-01-20 00:01:00 +0300
+++ graphviz-2.2/tclstubs/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tkspline/demo/Makefile.in graphviz-2.2/tkspline/demo/Makefile.in
--- graphviz-2.2-orig/tkspline/demo/Makefile.in	2005-01-20 00:01:02 +0300
+++ graphviz-2.2/tkspline/demo/Makefile.in	2005-02-13 20:37:08 +0300
@@ -19,7 +19,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tkspline/Makefile.in graphviz-2.2/tkspline/Makefile.in
--- graphviz-2.2-orig/tkspline/Makefile.in	2005-01-20 00:01:01 +0300
+++ graphviz-2.2/tkspline/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tkstubs/Makefile.in graphviz-2.2/tkstubs/Makefile.in
--- graphviz-2.2-orig/tkstubs/Makefile.in	2005-01-20 00:01:02 +0300
+++ graphviz-2.2/tkstubs/Makefile.in	2005-02-13 20:37:08 +0300
@@ -23,7 +23,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/tcl
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/ast/Makefile.in graphviz-2.2/tools/ast/Makefile.in
--- graphviz-2.2-orig/tools/ast/Makefile.in	2005-01-20 00:01:04 +0300
+++ graphviz-2.2/tools/ast/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/expr/Makefile.in graphviz-2.2/tools/expr/Makefile.in
--- graphviz-2.2-orig/tools/expr/Makefile.in	2005-01-20 00:01:04 +0300
+++ graphviz-2.2/tools/expr/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/gpr/Makefile.in graphviz-2.2/tools/gpr/Makefile.in
--- graphviz-2.2-orig/tools/gpr/Makefile.in	2005-01-20 00:01:05 +0300
+++ graphviz-2.2/tools/gpr/Makefile.in	2005-02-13 20:37:08 +0300
@@ -22,7 +22,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/Makefile.in graphviz-2.2/tools/Makefile.in
--- graphviz-2.2-orig/tools/Makefile.in	2005-01-20 00:01:03 +0300
+++ graphviz-2.2/tools/Makefile.in	2005-02-13 20:37:08 +0300
@@ -17,7 +17,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/sfio/Makefile.in graphviz-2.2/tools/sfio/Makefile.in
--- graphviz-2.2-orig/tools/sfio/Makefile.in	2005-01-20 00:01:06 +0300
+++ graphviz-2.2/tools/sfio/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/sfio/Sfio_dc/Makefile.in graphviz-2.2/tools/sfio/Sfio_dc/Makefile.in
--- graphviz-2.2-orig/tools/sfio/Sfio_dc/Makefile.in	2005-01-20 00:01:07 +0300
+++ graphviz-2.2/tools/sfio/Sfio_dc/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/sfio/Sfio_f/Makefile.in graphviz-2.2/tools/sfio/Sfio_f/Makefile.in
--- graphviz-2.2-orig/tools/sfio/Sfio_f/Makefile.in	2005-01-20 00:01:07 +0300
+++ graphviz-2.2/tools/sfio/Sfio_f/Makefile.in	2005-02-13 20:37:08 +0300
@@ -20,7 +20,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/src/Makefile.in graphviz-2.2/tools/src/Makefile.in
--- graphviz-2.2-orig/tools/src/Makefile.in	2005-01-20 00:01:08 +0300
+++ graphviz-2.2/tools/src/Makefile.in	2005-02-13 20:37:08 +0300
@@ -23,7 +23,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff -uNr graphviz-2.2-orig/tools/vmalloc/Makefile.in graphviz-2.2/tools/vmalloc/Makefile.in
--- graphviz-2.2-orig/tools/vmalloc/Makefile.in	2005-01-20 00:01:09 +0300
+++ graphviz-2.2/tools/vmalloc/Makefile.in	2005-02-13 20:37:08 +0300
@@ -21,7 +21,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd