85ee371
diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile
85ee371
--- highlight-2.6.9/makefile.mak	2008-03-26 22:17:36.000000000 +0100
85ee371
+++ highlight-2.6.9/makefile	2008-03-31 20:40:34.000000000 +0200
4a5cdc1
@@ -25,7 +25,7 @@ doc_dir = ${PREFIX}/share/doc/highlight/
4a5cdc1
 examples_dir = ${PREFIX}/share/doc/highlight/examples/
4a5cdc1
 
4a5cdc1
 # Location of the highlight config files:
4a5cdc1
-conf_dir = ${PREFIX}/etc/highlight/
4a5cdc1
+conf_dir = /etc/highlight/
4a5cdc1
 
4a5cdc1
 # Commands:
4a5cdc1
 INSTALL_DATA=install -m644
85ee371
@@ -51,21 +51,12 @@ all-gui-wx29:
4a5cdc1
 install:
4a5cdc1
 	@echo "This script will install highlight in the following directories:"
4a5cdc1
 	@echo "Data directory:	        ${DESTDIR}${data_dir}"
4a5cdc1
-	@echo "Documentation directory: ${DESTDIR}${doc_dir}"
4a5cdc1
-	@echo "Examples directory:      ${DESTDIR}${examples_dir}"
4a5cdc1
 	@echo "Manual directory:        ${DESTDIR}${man_dir}"
4a5cdc1
 	@echo "Binary directory:        ${DESTDIR}${bin_dir}"
4a5cdc1
 	@echo "Configuration directory: ${DESTDIR}${conf_dir}"
4a5cdc1
 	@echo
4a5cdc1
 
4a5cdc1
-	${MKDIR} ${DESTDIR}${doc_dir}
4a5cdc1
 	${MKDIR} ${DESTDIR}${conf_dir}
4a5cdc1
-	${MKDIR} ${DESTDIR}${examples_dir} \
4a5cdc1
-		${DESTDIR}${examples_dir}plugins \
4a5cdc1
-		${DESTDIR}${examples_dir}plugins/dokuwiki \
4a5cdc1
-		${DESTDIR}${examples_dir}plugins/movabletype \
4a5cdc1
-		${DESTDIR}${examples_dir}plugins/wordpress \
4a5cdc1
-		${DESTDIR}${examples_dir}swig
4a5cdc1
 	${MKDIR} ${DESTDIR}${data_dir} \
4a5cdc1
 		${DESTDIR}${data_dir}themes \
4a5cdc1
 		${DESTDIR}${data_dir}langDefs \
85ee371
@@ -80,22 +71,6 @@ install:
4a5cdc1
 	${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
4a5cdc1
 	${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
4a5cdc1
 	${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
4a5cdc1
-	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
4a5cdc1
-	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
4a5cdc1
-	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
4a5cdc1
-	${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir}
4a5cdc1
-	${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir}
93d9fc8
-	${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir}
4a5cdc1
-	${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir}
4a5cdc1
-	${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir}
4a5cdc1
-	${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir}
4a5cdc1
-	${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/
4a5cdc1
-	${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/
4a5cdc1
-	${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/
4a5cdc1
-	${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig
4a5cdc1
-	${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig
4a5cdc1
-	${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir}
85ee371
-	${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir}
4a5cdc1
 	${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
4a5cdc1
 
4a5cdc1
 	@echo
85ee371
@@ -121,7 +96,6 @@ install-gui:
4a5cdc1
 uninstall:
4a5cdc1
 	@echo "Removing highlight files from system..."
4a5cdc1
 	${RMDIR} ${DESTDIR}${data_dir}
4a5cdc1
-	${RMDIR} ${DESTDIR}${doc_dir}
4a5cdc1
 	${RMDIR} ${DESTDIR}${conf_dir}
85ee371
 	${RMDIR} ${DESTDIR}${examples_dir}
4a5cdc1
 	rm ${DESTDIR}${man_dir}highlight.1.gz