From eaca36ed78bafb82bd51a9e83c6445ef8f1698c8 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 22 May 2017 18:22:19 +0000 Subject: [PATCH] This fix to the Makefile is required to make i3lock-color build on Guix. --- Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c0fe888..b4b6cd9 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,6 @@ SYSCONFDIR=/etc PKG_CONFIG=pkg-config MANDIR=/usr/share/man -# Check if pkg-config is installed, we need it for building CFLAGS/LIBS -ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null 1>/dev/null || echo 1),1) -$(error "$(PKG_CONFIG) was not found") -endif - CFLAGS += -std=c99 CFLAGS += -pipe CFLAGS += -Wall @@ -18,7 +13,7 @@ CFLAGS += -O2 SIMD_CFLAGS += -funroll-loops SIMD_CFLAGS += -msse2 CPPFLAGS += -D_GNU_SOURCE -CPPFLAGS += -DXKBCOMPOSE=$(shell if test -e /usr/include/xkbcommon/xkbcommon-compose.h ; then echo 1 ; else echo 0 ; fi ) +CPPFLAGS += -DXKBCOMPOSE=1 CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11) LIBS += -lpam -- 2.13.0