$NetBSD: patch-aa,v 1.3 2009/03/02 22:10:27 rh Exp $ --- makefile.orig 2009-01-06 12:34:10.000000000 +1000 +++ makefile @@ -8,7 +8,6 @@ DESTDIR = # Root directory for final installation -PREFIX = /usr # Location of the highlight data files: data_dir = ${PREFIX}/share/highlight/ @@ -17,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/ bin_dir = ${PREFIX}/bin/ # Location of the highlight man page: -man_dir = ${PREFIX}/share/man/man1/ +man_dir = ${PREFIX}/${PKGMANDIR}/man1/ # Location of the highlight documentation: doc_dir = ${PREFIX}/share/doc/highlight/ @@ -26,17 +25,17 @@ doc_dir = ${PREFIX}/share/doc/highlight/ examples_dir = ${PREFIX}/share/doc/highlight/examples/ # Location of the highlight config files: -conf_dir = /etc/highlight/ +conf_dir = ${PREFIX}/share/examples/highlight/ #conf_dir = ${PREFIX}/etc/highlight/ desktop_apps = ${PREFIX}/share/applications/ desktop_pixmaps = ${PREFIX}/share/pixmaps/ # Commands: -INSTALL_DATA=install -m644 -INSTALL_PROGRAM=install -m755 -MKDIR=mkdir -p -m 755 -RMDIR=rm -r -f +INSTALL_DATA=${BSD_INSTALL_DATA} +INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} +MKDIR=${BSD_INSTALL_DATA_DIR} +RMDIR=${RM} -r -f all cli: ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} @@ -72,7 +71,7 @@ install: ${DESTDIR}${data_dir}langDefs \ ${DESTDIR}${data_dir}indentSchemes \ ${DESTDIR}${data_dir}helpmsg - ${MKDIR} ${DESTDIR}${man_dir} + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir} ${MKDIR} ${DESTDIR}${bin_dir} ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/ @@ -80,7 +79,7 @@ install: ${INSTALL_DATA} ./themes/*.style ${DESTDIR}${data_dir}themes/ ${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/ ${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/ - ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir} + ${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir} ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir} @@ -127,7 +126,7 @@ uninstall: ${RMDIR} ${DESTDIR}${doc_dir} ${RMDIR} ${DESTDIR}${conf_dir} ${RMDIR} ${DESTDIR}${examples_dir} - rm ${DESTDIR}${man_dir}highlight.1.gz + rm ${DESTDIR}${man_dir}highlight.1* rm ${DESTDIR}${bin_dir}highlight rm ${DESTDIR}${bin_dir}highlight-gui rm ${DESTDIR}${desktop_apps}highlight.desktop