From 9ff2fc3324503a95f1220521b8d063fca15a5db3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 19 May 2013 20:58:42 +0100 Subject: [PATCH] Allow system libjpeg to be in a non-standard location It doesn't have pkg-config metadata (at least on Debian), so if the user doesn't override it, assume normal system paths. --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 35c1fc96..416d1f17 100644 --- a/Makefile +++ b/Makefile @@ -1038,7 +1038,13 @@ ifeq ($(USE_INTERNAL_JPEG),1) BASE_CFLAGS += -DUSE_INTERNAL_JPEG BASE_CFLAGS += -I$(JPDIR) else - RENDERER_LIBS += -ljpeg + # libjpeg doesn't have pkg-config yet, but let users override with + # "make JPEG_CFLAGS=-I/opt/jpeg/include JPEG_LIBS='-L/opt/jpeg/lib -ljpeg'" + # if they need to + JPEG_CFLAGS ?= + JPEG_LIBS ?= -ljpeg + BASE_CFLAGS += $(JPEG_CFLAGS) + RENDERER_LIBS += $(JPEG_LIBS) endif ifeq ($(USE_FREETYPE),1)