--- highlight-2.4-1/makefile.org	2005-07-19 11:27:46.000000000 +0200
+++ highlight-2.4-1/makefile	2005-08-08 20:07:16.000000000 +0200
@@ -7,7 +7,7 @@
 data_dir = ${DESTDIR}/usr/share/highlight/
 
 # Location where the highlight binary will be installed:
-bin_dir = ${DESTDIR}/usr/local/bin/
+bin_dir = ${DESTDIR}/usr/bin/
 
 # Location where the highlight man page will be installed:
 man_dir = ${DESTDIR}/usr/share/man/man1/
@@ -16,8 +16,9 @@
 doc_dir = ${DESTDIR}/usr/share/doc/highlight/
 
 # Location where the highlight examples will be installed:
-examples_dir = ${doc_dir}examples/
+examples_dir = $(DESTDIR)/${doc_dir}examples/
 
+etc_dir = $(DESTDIR)/etc/highlight
 
 # Commands:
 INSTALL_DATA=install -m644
@@ -40,12 +41,6 @@
 	@echo "Binary directory:        ${bin_dir}"
 	@echo
 
-	${MKDIR} ${doc_dir}
-	${MKDIR} ${examples_dir} \
-		${examples_dir}cgi \
-		${examples_dir}cgi/perl \
-		${examples_dir}cgi/php \
-		${examples_dir}swig
 	${MKDIR} ${data_dir} \
 		${data_dir}themes \
 		${data_dir}langDefs \
@@ -53,25 +48,14 @@
 		${data_dir}helpmsg
 	${MKDIR} ${man_dir}
 	${MKDIR} ${bin_dir}
+	$(MKDIR) $(etc_dir)
 
 	${INSTALL_DATA} ./langDefs/*.lang ${data_dir}langDefs/
-	${INSTALL_DATA} ./*.conf ${data_dir}
+	${INSTALL_DATA} ./*.conf ${etc_dir}
 	${INSTALL_DATA} ./themes/*.style ${data_dir}themes/
 	${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/
 	${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/
 	${INSTALL_DATA} ./man/highlight.1.gz ${man_dir}
-	${INSTALL_DATA} ./AUTHORS ${doc_dir}
-	${INSTALL_DATA} ./README ${doc_dir}
-	${INSTALL_DATA} ./README_DE ${doc_dir}
-	${INSTALL_DATA} ./README_INDENT ${doc_dir}
-	${INSTALL_DATA} ./ChangeLog ${doc_dir}
-	${INSTALL_DATA} ./COPYING ${doc_dir}
-	${INSTALL_DATA} ./INSTALL ${doc_dir}
-	${INSTALL_DATA} ./examples/cgi/php/* ${examples_dir}cgi/php
-	${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${examples_dir}swig
-	${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${examples_dir}swig
-	${INSTALL_DATA} ./examples/swig/README_SWIG ${doc_dir}
-	${INSTALL_PROGRAM} ./examples/cgi/perl/highlight.cgi ${examples_dir}cgi/perl
 	${INSTALL_PROGRAM} ./highlight/highlight ${bin_dir}
 
 	@echo