--- Makefile.orig	Fri Dec  7 17:01:19 2001
+++ Makefile	Fri Dec  7 17:01:56 2001
@@ -1,10 +1,7 @@
 PYTHON=python
-prefix=/usr/local
+prefix=%%PREFIX%%
 exec_prefix=${prefix}
-
-#finds the site-packages dir that matches the selected prefix, or if none do, falls back to wherever it can find one..
-pkgdir=`$(PYTHON) -c 'import sys,re; x=filter(lambda x: re.match("$(prefix).*site-packages",x),sys.path); y=filter(lambda y: re.search("site-packages",y),sys.path); x.sort(lambda x,y: cmp(len(x),len(y))); y.sort(lambda x,y: cmp(len(x),len(y))); x.extend(y); print x[0]'`
-#nice little expression, huh? ;)
+pkgdir=%%SITELIBDIR%%
 
 bindir=${exec_prefix}/bin
 mandir=${prefix}/man
@@ -39,16 +36,16 @@
 cfv.wrapper:
 	$(PYTHON) -c 'import string,os; py=filter(lambda x: os.path.isfile(x),map(lambda x: os.path.join(x,"$(PYTHON)"),string.split(os.environ["PATH"],":"))); py.append(" /usr/bin/env $(PYTHON)"); open("cfv.wrapper","w").write("#!%s\nimport cfv\ncfv.main()\n"%py[0])'
 
-$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(bindir):
+$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdir):
 	$(install_dir) $@
 
-install-wrapper-only: $(DESTDIR)$(bindir) cfv.wrapper install_man
+install-wrapper-only: $(DESTDIR)$(pkgdir) $(DESTDIR)$(bindir) cfv.wrapper
 	$(install_data) cfv $(DESTDIR)$(pkgdir)/cfv.py
 	$(install_script) cfv.wrapper $(DESTDIR)$(bindir)/cfv
 
-install-wrapper: install-wrapper-only
-	$(PYTHON) -c "import py_compile; py_compile.compile('$(DESTDIR)$(pkgdir)/cfv.py')" 
-	$(PYTHON) -O -c "import py_compile; py_compile.compile('$(DESTDIR)$(pkgdir)/cfv.py')" 
+install-wrapper: install-wrapper-only install_man
+	$(PYTHON) -m compileall -d $(pkgdir) -l $(DESTDIR)$(pkgdir) 
+	$(PYTHON) -O -m compileall -d $(pkgdir) -l $(DESTDIR)$(pkgdir) 
 
 install: $(DESTDIR)$(bindir) install_man
 	$(install_script) cfv $(DESTDIR)$(bindir)/cfv