diff -urN bibus-1.4.0rc2/Makefile bibus-1.4.0/Makefile
--- bibus-1.4.0rc2/Makefile	2007-11-18 11:14:00.000000000 -0600
+++ bibus-1.4.0/Makefile	2008-02-06 12:06:25.000000000 -0600
@@ -1,5 +1,5 @@
 # you presumably will only have to change the three first lines below
-DESTDIR = /usr/local
+DESTDIR = ${D}usr
 python = /usr/bin/python
 oopath = /usr/lib/openoffice/program
 #
@@ -7,7 +7,7 @@
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 datadir = $(prefix)/share
-sysconfdir = /etc
+sysconfdir = ${D}etc
 mandir = $(prefix)/share/man
 man1dir = $(mandir)/man1
 
@@ -42,23 +42,23 @@
 	chmod 755 $(datadir)/bibus/bibusStart.py
 
 	# basic doc files
-	install -m755 -d $(datadir)/doc/bibus
-	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
+	install -m755 -d $(datadir)/doc/${PF}
+	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/${PF}
 
 	# generating bibus.cfg file
 	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
 	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
 	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
-	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
-	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
-	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
-	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
+	echo 'docdir = $(datadir)/doc/${PF}/html' >> $(datadir)/bibus/bibus.cfg
+	echo 'licence = $(datadir)/doc/${PF}/copying' >> $(datadir)/bibus/bibus.cfg
+	echo 'localedir = /usr/share/locale' >> $(datadir)/bibus/bibus.cfg
+	echo 'systemconf = /etc/bibus.config' >> $(datadir)/bibus/bibus.cfg
 endef
 
 define install-doc-en
 	# copying docs in from Docs/html/en/ for bibus-doc-en
 	cd Docs;\
-	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
+	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/${PF}/'{}' ';'
 endef
 
 define compile
@@ -85,7 +85,7 @@
 		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
-		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+		echo "rm -rf $(datadir)/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
diff -urN bibus-1.4.0rc2/Setup/bibus.sh bibus-1.4.0/Setup/bibus.sh
--- bibus-1.4.0rc2/Setup/bibus.sh	2007-11-18 11:14:00.000000000 -0600
+++ bibus-1.4.0/Setup/bibus.sh	2008-02-06 12:06:25.000000000 -0600
@@ -1,4 +1,4 @@
 #!/bin/sh
 export LD_LIBRARY_PATH=/usr/lib/openoffice/program
 export PYTHONPATH=/usr/lib/openoffice/program
-exec /usr/bin/python /usr/local/share/bibus/bibus.py
+exec /usr/bin/python /usr/share/bibus/bibus.py
diff -urN bibus-1.4.0rc2/Setup/Makefile bibus-1.4.0/Setup/Makefile
--- bibus-1.4.0rc2/Setup/Makefile	2007-11-18 11:14:00.000000000 -0600
+++ bibus-1.4.0/Setup/Makefile	2008-02-06 12:06:25.000000000 -0600
@@ -1,5 +1,5 @@
 # you presumably will only have to change the three first lines below
-DESTDIR = /usr/local
+DESTDIR = ${D}usr
 python = /usr/bin/python
 oopath = /usr/lib/openoffice/program
 #
@@ -7,7 +7,7 @@
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 datadir = $(prefix)/share
-sysconfdir = /etc
+sysconfdir = ${D}etc
 mandir = $(prefix)/share/man
 man1dir = $(mandir)/man1
 
@@ -42,23 +42,23 @@
 	chmod 755 $(datadir)/bibus/bibusStart.py
 
 	# basic doc files
-	install -m755 -d $(datadir)/doc/bibus
-	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
+	install -m755 -d $(datadir)/doc/${PF}
+	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/${PF}
 
 	# generating bibus.cfg file
 	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
 	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
 	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
-	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
-	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
-	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
-	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
+	echo 'docdir = /usr/share/doc/${PF}/html' >> $(datadir)/bibus/bibus.cfg
+	echo 'licence = /usr/share/doc/${PF}/copying' >> $(datadir)/bibus/bibus.cfg
+	echo 'localedir = /usr/share/locale' >> $(datadir)/bibus/bibus.cfg
+	echo 'systemconf = /etc/bibus.config' >> $(datadir)/bibus/bibus.cfg
 endef
 
 define install-doc-en
 	# copying docs in from Docs/html/en/ for bibus-doc-en
 	cd Docs;\
-	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
+	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/${PF}/'{}' ';'
 endef
 
 define compile
@@ -85,7 +85,7 @@
 		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
-		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+		echo "rm -rf $(datadir)/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh