--- Makefile.in	2006-11-24 15:15:31.000000000 +0100
+++ Makefile.in.oden	2006-12-19 21:57:27.000000000 +0100
@@ -1,5 +1,9 @@
 
-prefix=@prefix@
+bindir=@bindir@
+datadir=@datadir@
+includedir=@includedir@
+libdir=@libdir@
+DESTDIR=
 
 colorer:
 	@echo ---------------- Building Colorer-take5 console tools
@@ -14,28 +18,22 @@
 
 
 install:
-	install -g 0 -o 0 -m 755 -d $(prefix)
-	install -g 0 -o 0 -m 755 -d $(prefix)/lib
-	install -g 0 -o 0 -m 755 src/libcolorer/libcolorer.so $(prefix)/lib
-
-	install -g 0 -o 0 -m 755 -d $(prefix)/bin
-	install -g 0 -o 0 -m 755 src/colorer/colorer $(prefix)/bin
-
-	install -g 0 -o 0 -m 755 -d $(prefix)/share
-	install -g 0 -o 0 -m 755 -d $(prefix)/share/colorer
-	install -g 0 -o 0 -m 755 -d $(prefix)/share/colorer/bin
-	cp -r hrc $(prefix)/share/colorer/
-	cp -r hrd $(prefix)/share/colorer/
-	cp -r bin/4ever2take5 bin/apache bin/doclinks bin/xsd2hrc bin/ue2hrc $(prefix)/share/colorer/bin
-	cp catalog.xml LICENSE README $(prefix)/share/colorer
-	echo > /tmp/colorer.log
-	chmod 0777 /tmp/colorer.log
-
-	install -g 0 -o 0 -m 755 -d $(prefix)/share/doc
-	install -g 0 -o 0 -m 755 -d $(prefix)/share/doc/colorer-take5
-	cp -r doc/* $(prefix)/share/doc/colorer-take5
-
-	install -g 0 -o 0 -m 755 -d $(prefix)/include
-	install -g 0 -o 0 -m 755 -d $(prefix)/include/colorer
-	cd src/shared; cp --parents `find . -name '*.h'` $(prefix)/include/colorer
+	install -m 755 -d $(DESTDIR)$(libdir)
+	install -m 755 src/libcolorer/libcolorer.so.0 $(DESTDIR)$(libdir)
+
+	install -m 755 -d $(DESTDIR)$(bindir)
+	install -m 755 src/colorer/colorer $(DESTDIR)$(bindir)
+
+	install -m 755 -d $(DESTDIR)$(datadir)/colorer
+	install -m 755 -d $(DESTDIR)$(datadir)/colorer/bin
+	cp -r hrc $(DESTDIR)$(datadir)/colorer/
+	cp -r hrd $(DESTDIR)$(datadir)/colorer/
+	cp -r bin/4ever2take5 bin/apache bin/doclinks bin/xsd2hrc bin/ue2hrc $(DESTDIR)$(datadir)/colorer/bin
+	cp catalog.xml LICENSE README $(DESTDIR)$(datadir)/colorer
+
+	install -m 755 -d $(DESTDIR)$(datadir)/doc/colorer-take5
+	cp -r doc/* $(DESTDIR)$(datadir)/doc/colorer-take5
+
+	install -m 755 -d $(DESTDIR)$(includedir)/colorer
+	cd src/shared; cp --parents `find . -name '*.h'` $(DESTDIR)$(includedir)/colorer
 	cd ../..