|
28
|
1 |
diff --git a/Makefile b/Makefile
|
|
|
2 |
index 555b770..01025b9 100644
|
|
|
3 |
--- a/Makefile
|
|
|
4 |
+++ b/Makefile
|
|
|
5 |
@@ -13,6 +13,7 @@ WITH_VIRTUAL_INPUT = YES
|
|
|
6 |
OS != uname
|
|
|
7 |
VERSION ?= "CURRENT"
|
|
|
8 |
PREFIX ?= /usr/local
|
|
|
9 |
+PKG_CONFIG ?= pkg-config
|
|
|
10 |
ETC_PREFIX ?= ${PREFIX}
|
|
|
11 |
|
|
|
12 |
OBJS = \
|
|
|
13 |
@@ -78,7 +79,7 @@ OBJS += \
|
|
|
14 |
xwayland_view.o
|
|
|
15 |
.endif
|
|
|
16 |
|
|
|
17 |
-WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
|
|
|
18 |
+WAYLAND_PROTOCOLS != ${PKG_CONFIG} --variable pkgdatadir wayland-protocols
|
|
|
19 |
|
|
|
20 |
.PHONY: distclean clean clean-doc doc dist install uninstall
|
|
|
21 |
.PATH: src
|
|
|
22 |
@@ -125,31 +126,31 @@ CFLAGS += -DHAVE_VIRTUAL_INPUT=1
|
|
|
23 |
|
|
|
24 |
CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
|
|
|
25 |
|
|
|
26 |
-WLROOTS_CFLAGS != pkg-config --cflags wlroots
|
|
|
27 |
-WLROOTS_LIBS != pkg-config --libs wlroots
|
|
|
28 |
+WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots
|
|
|
29 |
+WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots
|
|
|
30 |
|
|
|
31 |
WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
|
|
|
32 |
|
|
|
33 |
-PANGO_CFLAGS != pkg-config --cflags pangocairo
|
|
|
34 |
-PANGO_LIBS != pkg-config --libs pangocairo
|
|
|
35 |
+PANGO_CFLAGS != ${PKG_CONFIG} --cflags pangocairo
|
|
|
36 |
+PANGO_LIBS != ${PKG_CONFIG} --libs pangocairo
|
|
|
37 |
|
|
|
38 |
-CAIRO_CFLAGS != pkg-config --cflags cairo
|
|
|
39 |
-CAIRO_LIBS != pkg-config --libs cairo
|
|
|
40 |
+CAIRO_CFLAGS != ${PKG_CONFIG} --cflags cairo
|
|
|
41 |
+CAIRO_LIBS != ${PKG_CONFIG} --libs cairo
|
|
|
42 |
|
|
|
43 |
-PIXMAN_CFLAGS != pkg-config --cflags pixman-1
|
|
|
44 |
-PIXMAN_LIBS != pkg-config --libs pixman-1
|
|
|
45 |
+PIXMAN_CFLAGS != ${PKG_CONFIG} --cflags pixman-1
|
|
|
46 |
+PIXMAN_LIBS != ${PKG_CONFIG} --libs pixman-1
|
|
|
47 |
|
|
|
48 |
-XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
|
|
|
49 |
-XKBCOMMON_LIBS != pkg-config --libs xkbcommon
|
|
|
50 |
+XKBCOMMON_CFLAGS != ${PKG_CONFIG} --cflags xkbcommon
|
|
|
51 |
+XKBCOMMON_LIBS != ${PKG_CONFIG} --libs xkbcommon
|
|
|
52 |
|
|
|
53 |
-WAYLAND_CFLAGS != pkg-config --cflags wayland-server
|
|
|
54 |
-WAYLAND_LIBS != pkg-config --libs wayland-server
|
|
|
55 |
+WAYLAND_CFLAGS != ${PKG_CONFIG} --cflags wayland-server
|
|
|
56 |
+WAYLAND_LIBS != ${PKG_CONFIG} --libs wayland-server
|
|
|
57 |
|
|
|
58 |
-LIBINPUT_CFLAGS != pkg-config --cflags libinput
|
|
|
59 |
-LIBINPUT_LIBS != pkg-config --libs libinput
|
|
|
60 |
+LIBINPUT_CFLAGS != ${PKG_CONFIG} --cflags libinput
|
|
|
61 |
+LIBINPUT_LIBS != ${PKG_CONFIG} --libs libinput
|
|
|
62 |
|
|
|
63 |
-UCL_CFLAGS != pkg-config --cflags libucl
|
|
|
64 |
-UCL_LIBS != pkg-config --libs libucl
|
|
|
65 |
+UCL_CFLAGS != ${PKG_CONFIG} --cflags libucl
|
|
|
66 |
+UCL_LIBS != ${PKG_CONFIG} --libs libucl
|
|
|
67 |
|
|
|
68 |
CFLAGS += \
|
|
|
69 |
${WLROOTS_CFLAGS} \
|
|
|
70 |
@@ -192,7 +193,7 @@ wlr-layer-shell-unstable-v1-protocol.h:
|
|
|
71 |
wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
|
|
|
72 |
|
|
|
73 |
hikari-unlocker: hikari_unlocker.c
|
|
|
74 |
- ${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
|
|
|
75 |
+ ${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o hikari-unlocker hikari_unlocker.c -lpam
|
|
|
76 |
|
|
|
77 |
clean-doc:
|
|
|
78 |
@test -e _darcs && echo "cleaning manpage" ||:
|