diff options
author | Simon McVittie <smcv@debian.org> | 2013-05-19 20:58:42 +0100 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2014-08-28 11:02:37 +0100 |
commit | edc7f497dc90a1c61e477697747fed44e36a0042 (patch) | |
tree | 4ed52f6f116761d65402c1bcbcf637e538e0031f /Makefile | |
parent | 9d55890bd5c6cf6be07a6de3c106942844b80616 (diff) |
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.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1019,7 +1019,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) |