1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
$NetBSD: patch-makefile,v 1.8 2022/10/03 18:09:12 schmonz Exp $
Use pkgsrc-provided paths and tools.
--- makefile.orig 2022-09-28 17:52:30.000000000 +0000
+++ makefile
@@ -7,7 +7,7 @@
DESTDIR =
# Root directory for final installation
-PREFIX = /usr
+#PREFIX = /usr
# Data file directory
data_dir = ${PREFIX}/share/
@@ -22,7 +22,7 @@ bin_dir = ${PREFIX}/bin/
lib_dir = ${PREFIX}/lib/
# Location of the highlight man pages:
-man_dir = ${data_dir}man/
+man_dir = ${PREFIX}/${PKGMANDIR}/
# Documentation directory
doc_dir = ${data_dir}doc/
@@ -34,11 +34,12 @@ hl_doc_dir = ${doc_dir}highlight/
examples_dir = ${hl_doc_dir}extras/
# Location of system-wide config files:
-ifeq (${PREFIX},/usr)
- conf_dir = /etc/
-else
- conf_dir = ${PREFIX}/etc/
-endif
+#ifeq (${PREFIX},/usr)
+# conf_dir = /etc/
+#else
+# conf_dir = ${PREFIX}/etc/
+#endif
+conf_dir = ${PREFIX}/share/examples/
# Location of the highlight config files:
hl_conf_dir = ${conf_dir}highlight/
@@ -58,10 +59,10 @@ desktop_icons = ${data_dir}icons/hicolor
# Commands:
GZIP=gzip -9f
-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=${hl_data_dir} HL_CONFIG_DIR=${hl_conf_dir}
@@ -109,22 +110,15 @@ install:
${DESTDIR}${hl_data_dir}themes/base16 \
${DESTDIR}${hl_data_dir}langDefs \
${DESTDIR}${hl_data_dir}plugins
- ${MKDIR} ${DESTDIR}${man_dir}man1/
- ${MKDIR} ${DESTDIR}${man_dir}man5/
${MKDIR} ${DESTDIR}${bash_comp_dir}
${MKDIR} ${DESTDIR}${fish_comp_dir}
${MKDIR} ${DESTDIR}${zsh_comp_dir}
- ${MKDIR} ${DESTDIR}${bin_dir}
${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${hl_data_dir}langDefs/
${INSTALL_DATA} ./*.conf ${DESTDIR}${hl_conf_dir}
${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${hl_data_dir}themes/
${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${hl_data_dir}themes/base16/
${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${hl_data_dir}plugins/
- ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/
- ${GZIP} ${DESTDIR}${man_dir}man1/highlight.1
- ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
- ${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5
${INSTALL_DATA} ./sh-completion/highlight.bash ${DESTDIR}${bash_comp_dir}highlight
${INSTALL_DATA} ./sh-completion/highlight.fish ${DESTDIR}${fish_comp_dir}
@@ -145,12 +139,11 @@ install:
${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes
${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir}
${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir}
- ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
@echo
@echo "Done."
- @echo "Type highlight --help or man highlight for instructions."
@echo "Take a look at ${DESTDIR}${examples_dir} for scripts, SWIG and TCL bindings."
+ @echo "Execute 'make install-cli' to install the highlight CLI ('make cli')."
@echo "Execute 'make install-gui' to install the highlight GUI ('make gui')."
@echo "Do not hesitate to report problems. Unknown bugs are hard to fix."
@@ -169,6 +162,19 @@ install-gui:
${INSTALL_DATA} ./src/gui-qt/highlight.png ${DESTDIR}${desktop_icons}
${INSTALL_PROGRAM} ./src/highlight-gui ${DESTDIR}${bin_dir}
+install-cli:
+ @echo "Installing files for the CLI..."
+ ${MKDIR} ${DESTDIR}${bin_dir}
+ ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1
+ ${BSD_INSTALL_MAN} ./man/highlight.1 ${DESTDIR}${man_dir}/man1/
+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5
+ ${BSD_INSTALL_MAN} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
+
+ @echo
+ @echo "Done."
+ @echo "Type highlight --help or man highlight for instructions."
+
install-lib-shared:
${INSTALL_DATA} ./src/libhighlight.so.4.0 ${DESTDIR}${lib_dir}
@@ -178,8 +184,8 @@ uninstall:
${RMDIR} ${DESTDIR}${hl_doc_dir}
${RMDIR} ${DESTDIR}${hl_conf_dir}
${RMDIR} ${DESTDIR}${examples_dir}
- rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz
- rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz
+ rm -rf ${DESTDIR}${man_dir}man1/highlight.1*
+ rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5*
rm -rf ${DESTDIR}${bash_comp_dir}highlight.bash
rm -rf ${DESTDIR}${fish_comp_dir}highlight.fish
|
