--- PyX-0.8.1/setup.cfg.orig	2005-09-05 18:30:36.000000000 +0200
+++ PyX-0.8.1/setup.cfg	2005-09-05 18:31:14.000000000 +0200
@@ -2,11 +2,11 @@
 # In this section you can specify which c extension modules should be built
 
 # C extension module for partial font downloading
-build_t1strip=0
+build_t1strip=1
 
 # Python bindings for the kpathsea library. You need the kpathsea header
 # and library and you may need to specify their location below.
-build_pykpathsea=0
+build_pykpathsea=1
 
 [build_ext]
 # additional include and library directories:
@@ -14,5 +14,5 @@
 #   the pykpathsea extention module and libkpathsea is not installed in
 #   the default search paths of your compiler and linker
 
-# include_dirs=
-# library_dirs=
+include_dirs=@PREFIX@/include
+library_dirs=@PREFIX@/lib
--- PyX-0.8.1/setup.py.orig	2005-09-05 18:25:28.000000000 +0200
+++ PyX-0.8.1/setup.py	2005-09-07 17:11:42.000000000 +0200
@@ -61,7 +61,7 @@
     data_files.append((dir, files))
     siteconfignames[files] = siteconfigname
 
-adddatafiles("lfsdir", "share/pyx", ["pyx/lfs/10pt.lfs",
+adddatafiles("lfsdir", "share/pyx-py@PYTHON_FLAVOR@", ["pyx/lfs/10pt.lfs",
                                      "pyx/lfs/11pt.lfs",
                                      "pyx/lfs/12pt.lfs",
                                      "pyx/lfs/10ptex.lfs",
@@ -71,11 +71,11 @@
                                      "pyx/lfs/foils20pt.lfs",
                                      "pyx/lfs/foils25pt.lfs",
                                      "pyx/lfs/foils30pt.lfs"])
-adddatafiles("sharedir", "share/pyx", ["contrib/pyx.def"])
+adddatafiles("sharedir", "share/pyx-py@PYTHON_FLAVOR@", ["contrib/pyx.def"])
 
 # Note that on windows we can't install to absolute paths. Hence
 # we put the global pyxrc into the share directory as well.
-adddatafiles("pyxrcdir", os.name != "nt" and "/etc" or "share/pyx", ["pyxrc"])
+adddatafiles("pyxrcdir", os.name != "nt" and "etc" or "share/pyx-py@PYTHON_FLAVOR@", ["pyxrc-py@PYTHON_FLAVOR@"])
 
 ################################################################################
 # extend install commands to overwrite siteconfig.py during build and install
@@ -123,7 +123,7 @@
             # (the following four lines are copied from within the install_data.run loop)
             dir = convert_path(dir)
             if not os.path.isabs(dir):
-                dir = os.path.join(self.install_dir, dir)
+                dir = os.path.join("@PREFIX@", dir)
             elif self.root:
                 dir = change_root(self.root, dir)
 
--- PyX-0.8.1/manual/Makefile.orig	2005-09-06 16:43:38.000000000 +0200
+++ PyX-0.8.1/manual/Makefile	2005-09-06 16:46:43.000000000 +0200
@@ -22,7 +22,7 @@
 pdf:manual.pdf
 html:manual/manual.html
 
-manual.pdf: $(src)
+manual.pdf: $(src) eps
 	#for index-with-own-hyperrefs debugging, anybody interested?
 	#./mkhowto --a4 --pdf --keep manual.tex
 	./mkhowto --a4 --pdf manual.tex
--- PyX-0.8.1/pyx/config.py.orig	2005-11-11 11:36:51.000000000 +0100
+++ PyX-0.8.1/pyx/config.py	2005-11-11 11:37:36.000000000 +0100
@@ -24,7 +24,7 @@
 import ConfigParser, os.path
 import siteconfig
 
-cflist = [os.path.join(siteconfig.pyxrcdir, "pyxrc"),  os.path.expanduser("~/.pyxrc")]
+cflist = [os.path.join(siteconfig.pyxrcdir, "pyxrc-py@PYTHON_FLAVOR@"),  os.path.expanduser("~/.pyxrc")]
 
 config = ConfigParser.ConfigParser()
 config.read(cflist)