Respect EXEC_PREFIX and a users' choice of PKG_CONFIG.

[i3/i3] / i3-input / i3-input.mk

diff --git a/i3-input/i3-input.mk b/i3-input/i3-input.mk
index 98131e76e099a2a9f42ed8f5f93b603a1679866a..be3e28331d263d02d820be553ae4e0d82508b491 100644 (file)
--- a/i3-input/i3-input.mk
+++ b/i3-input/i3-input.mk
@@ -4,15 +4,15 @@ CLEAN_TARGETS += clean-i3-input
 
 i3_input_SOURCES := $(wildcard i3-input/*.c)
 i3_input_HEADERS := $(wildcard i3-input/*.h)
-i3_input_CFLAGS   = $(XCB_CFLAGS) $(XCB_KBD_CFLAGS)
-i3_input_LIBS     = $(XCB_LIBS) $(XCB_KBD_LIBS)
+i3_input_CFLAGS   = $(XCB_CFLAGS) $(XCB_KBD_CFLAGS) $(PANGO_CFLAGS)
+i3_input_LIBS     = $(XCB_LIBS) $(XCB_KBD_LIBS) $(PANGO_LIBS)
 
 i3_input_OBJECTS := $(i3_input_SOURCES:.c=.o)
 
 
 i3-input/%.o: i3-input/%.c $(i3_input_HEADERS)
        echo "[i3-input] CC $<"
-       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_input_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
+       $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_input_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
 
 i3-input/i3-input: libi3.a $(i3_input_OBJECTS)
        echo "[i3-input] Link i3-input"
@@ -20,8 +20,8 @@ i3-input/i3-input: libi3.a $(i3_input_OBJECTS)
 
 install-i3-input: i3-input/i3-input
        echo "[i3-input] Install"
-       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
-       $(INSTALL) -m 0755 i3-input/i3-input $(DESTDIR)$(PREFIX)/bin/
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/bin
+       $(INSTALL) -m 0755 i3-input/i3-input $(DESTDIR)$(EXEC_PREFIX)/bin/
 
 clean-i3-input:
        echo "[i3-input] Clean"