--- src/Makefile.orig	2008-07-28 16:16:23 UTC
+++ src/Makefile
@@ -79,16 +79,16 @@ install-bin:
 install-bin:
 	@echo " --- Installing binary --- "
 	@mkdir -p ${DESTDIR}${prefix}/bin;
-	install -m 0755 -o root pal ${DESTDIR}${prefix}/bin;
-	install -m 0755 -o root convert/vcard2pal ${DESTDIR}${prefix}/bin;
+	install -m 0755 pal ${DESTDIR}${prefix}/bin;
+	install -m 0755 convert/vcard2pal ${DESTDIR}${prefix}/bin;
 	@echo
 
 install-share:
 	@echo " --- Installing global data --- "
 	@mkdir -p ${DESTDIR}${prefix}/share/pal;
-	install -m 0644 -o root ../share/*.pal ${DESTDIR}${prefix}/share/pal
-	@mkdir -p ${DESTDIR}/etc;
-	install -m 0644 -o root ../pal.conf ${DESTDIR}/etc/
+	install -m 0644 ../share/*.pal ${DESTDIR}${prefix}/share/pal
+	@mkdir -p ${DESTDIR}${prefix}/share/examples/pal/;
+	install -m 0644 ../pal.conf ${DESTDIR}${prefix}/share/examples/pal/
 	@echo
 
 # "install" will install the files needed by pal and also check to see
@@ -112,8 +112,8 @@ install-man:
 	@echo " --- Installing man page --- "
 	cd ../; sed 's/PAL_VERSION/$(PAL_VERSION)/' pal.1.template | gzip -9 > pal.1.gz
 	@mkdir -p ${DESTDIR}${prefix}/share/man/man1/
-	install -m 0644 -o root ../pal.1.gz ${DESTDIR}${prefix}/share/man/man1/
-	install -m 0644 -o root convert/vcard2pal.1 ${DESTDIR}${prefix}/share/man/man1/
+	install -m 0644 ../pal.1.gz ${DESTDIR}${prefix}/share/man/man1/
+	install -m 0644 convert/vcard2pal.1 ${DESTDIR}${prefix}/share/man/man1/
 	rm ../pal.1.gz
 	@echo
 
@@ -122,15 +122,15 @@ install-doc:
 	@echo " --- Installing docs --- "
 	@mkdir -p ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
 	cat ../COPYING | gzip -9 > ../COPYING.gz
-	install -m 0644 -o root ../COPYING.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+	install -m 0644 ../COPYING.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
 	rm ../COPYING.gz
 	cat ../INSTALL | gzip -9 > ../INSTALL.gz
-	install -m 0644 -o root ../INSTALL.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+	install -m 0644 ../INSTALL.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
 	rm ../INSTALL.gz
 	cat ../ChangeLog | gzip -9 > ../ChangeLog.gz
-	install -m 0644 -o root ../ChangeLog.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+	install -m 0644 ../ChangeLog.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
 	rm ../ChangeLog.gz
-	install -m 0644 -o root ../doc/example.css ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+	install -m 0644 ../doc/example.css ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
 	@echo
 
 
@@ -140,27 +140,27 @@ install-mo:
 	@# GERMAN
 	mkdir -p ${DESTDIR}${prefix}/share/locale/de/LC_MESSAGES/
 	cd ../po; msgfmt de.po -o de.mo
-	install -m 0644 -o root ../po/de.mo ${DESTDIR}${prefix}/share/locale/de/LC_MESSAGES/pal.mo
+	install -m 0644 ../po/de.mo ${DESTDIR}${prefix}/share/locale/de/LC_MESSAGES/pal.mo
 	rm ../po/de.mo
 	@# SWEDISH
 	mkdir -p ${DESTDIR}${prefix}/share/locale/sv/LC_MESSAGES/
 	cd ../po; msgfmt sv.po -o sv.mo
-	install -m 0644 -o root ../po/sv.mo ${DESTDIR}${prefix}/share/locale/sv/LC_MESSAGES/pal.mo
+	install -m 0644 ../po/sv.mo ${DESTDIR}${prefix}/share/locale/sv/LC_MESSAGES/pal.mo
 	rm ../po/sv.mo
 	@# SPANISH
 	mkdir -p ${DESTDIR}${prefix}/share/locale/es/LC_MESSAGES/
 	cd ../po; msgfmt es.po -o es.mo
-	install -m 0644 -o root ../po/es.mo ${DESTDIR}${prefix}/share/locale/es/LC_MESSAGES/pal.mo
+	install -m 0644 ../po/es.mo ${DESTDIR}${prefix}/share/locale/es/LC_MESSAGES/pal.mo
 	rm ../po/es.mo
 	@# POLISH
 	mkdir -p ${DESTDIR}${prefix}/share/locale/pl/LC_MESSAGES/
 	cd ../po; msgfmt pl.po -o pl.mo
-	install -m 0644 -o root ../po/pl.mo ${DESTDIR}${prefix}/share/locale/pl/LC_MESSAGES/pal.mo
+	install -m 0644 ../po/pl.mo ${DESTDIR}${prefix}/share/locale/pl/LC_MESSAGES/pal.mo
 	rm ../po/pl.mo
 	@# TURKISH
 	mkdir -p ${DESTDIR}${prefix}/share/locale/tr/LC_MESSAGES/
 	cd ../po; msgfmt tr.po -o tr.mo
-	install -m 0644 -o root ../po/tr.mo ${DESTDIR}${prefix}/share/locale/tr/LC_MESSAGES/pal.mo
+	install -m 0644 ../po/tr.mo ${DESTDIR}${prefix}/share/locale/tr/LC_MESSAGES/pal.mo
 	rm ../po/tr.mo
 	@echo
 
@@ -175,8 +175,8 @@ uninstall: uninstall-mo uninstall-man
 	@echo " --- Removing doc directory --- "
 	rm -rf ${prefix}/share/doc/pal-$(PAL_VERSION);
 	@echo
-	@echo " --- Removing /etc/pal.conf --- "
-	rm -f /etc/pal.conf;
+	@echo " --- Removing ${prefix}/etc/pal.conf --- "
+	rm -f ${prefix}/etc/pal.conf;
 	@echo
 	@echo " --- Check for doc directories for other versions of pal --- "
 	@echo " NOTE: If you don't have other copies of pal installed, you can"