Skip to content

Instantly share code, notes, and snippets.

@257
Created May 17, 2017 16:17
Show Gist options
  • Save 257/cc0c1de389393dcde56dd7376b76b305 to your computer and use it in GitHub Desktop.
Save 257/cc0c1de389393dcde56dd7376b76b305 to your computer and use it in GitHub Desktop.
stdin
diff --git a/Makefile b/Makefile
index aa99cdc..b2ad05a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,10 @@ LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR ?= $(PREFIX)/include
DATADIR ?= $(PREFIX)/share
PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
+PKG_CONFIG_PATH += $(PKGCONFIGDIR)
OBJCOPY ?= objcopy
-PKG_CONFIG ?= pkg-config
+PKG_CONFIG ?= PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config
WAYLAND_SCANNER ?= wayland-scanner
VERSION_MAJOR := 0
@@ -52,7 +53,7 @@ wayland-server_CONSTRAINTS := --atleast-version=1.6.0
define check
ifeq ($$(origin $(1)_EXISTS),undefined)
- $(1)_EXISTS = $$(shell $$(PKG_CONFIG) --exists $$($(1)_CONSTRAINTS) $(1) && echo yes)
+ $(1)_EXISTS = $$(shell $$(PKG_CONFIG) --print-errors --exists $$($(1)_CONSTRAINTS) $(1))yes
endif
ifneq ($$($(1)_EXISTS),yes)
$$(error Could not find package $(1) $$($(1)_CONSTRAINTS))
@@ -118,4 +119,3 @@ clean:
rm -f $(CLEAN_FILES)
-include .deps/*/*.d
-
diff --git a/config.mk b/config.mk
index 0a8fdf0..cbcd51d 100644
--- a/config.mk
+++ b/config.mk
@@ -2,7 +2,7 @@
# The commented out options are defaults
-# PREFIX = /usr/local
+PREFIX = ${HOME}/.local
# BINDIR = $(PREFIX)/bin
# LIBDIR = $(PREFIX)/lib
# INCLUDEDIR = $(PREFIX)/include
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment