--- Makefile.orig	2006-06-03 09:59:29.000000000 -0400
+++ Makefile	2006-06-03 10:27:38.000000000 -0400
@@ -1,7 +1,7 @@
 
-prefix=/usr/local
-bindir=$(prefix)/bin
-datadir=$(prefix)/share
+prefix=/usr/lib
+bindir=/usr/bin
+datadir=$(prefix)
 docdir=$(datadir)/doc
 
 DESTDIR=
@@ -13,13 +13,14 @@
 UNINSTALL=rm
 UNINSTALL_DIR=rm -r
 
-pkg_datadir=$(datadir)/cjc
+pkg_datadir=$(datadir)
 pkg_docdir=$(docdir)/cjc
 
 VERSION=1.0.0
 SNAPSHOT=
 
-PY_DIRS=cjc cjc/ui plugins
+PY_DIRS=cjc cjc/ui
+PY_PLUGINDIRS=plugins
 DOCS=doc/manual.html COPYING ChangeLog README TODO
 
 EXTRA_DIST=cjc.in cjc.py doc/manual.xml doc/Makefile
@@ -58,9 +59,13 @@
 		$(INSTALL_DIR) $(DESTDIR)$(pkg_datadir)/$$d ; \
 		$(INSTALL_DATA) $$d/*.py $(DESTDIR)$(pkg_datadir)/$$d ; \
 	done
+	for d in $(PY_PLUGINDIRS) ; do \
+		$(INSTALL_DIR) $(DESTDIR)$(pkg_datadir)/cjc/$$d ; \
+		$(INSTALL_DATA) $$d/*.py $(DESTDIR)$(pkg_datadir)/cjc/$$d ; \
+	done
 	python -c "import compileall; compileall.compile_dir('$(DESTDIR)$(pkg_datadir)', ddir='$(pkg_datadir)')" 
-	$(INSTALL_DIR) $(DESTDIR)$(pkg_docdir)
-	$(INSTALL_DATA) $(DOCS) $(DESTDIR)$(pkg_docdir)
+#	$(INSTALL_DIR) $(DESTDIR)$(pkg_docdir)
+#	$(INSTALL_DATA) $(DOCS) $(DESTDIR)$(pkg_docdir)
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL) cjc.inst $(DESTDIR)$(bindir)/cjc