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