From 5b2ab4418541e294abff56a37d861a4f1cc38db9 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Mon, 16 Jun 2014 02:46:44 +0000 Subject: Release 10.66.03 git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2204 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/other/jpeg2000/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'converter/other/jpeg2000') diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index f2e3b4a1..7b008906 100644 --- a/converter/other/jpeg2000/Makefile +++ b/converter/other/jpeg2000/Makefile @@ -10,16 +10,18 @@ SUBDIRS = libjasper include $(BUILDDIR)/config.mk EXTERN_INCLUDES = -ifneq ($(JASPERHDR_DIR),NONE) - EXTERN_INCLUDES += -I$(JASPERHDR_DIR) -endif - # INTERNAL_JASPERLIB must be relative to the current directory, because it # may end up in MERGE_OBJECTS, which must be relative. INTERNAL_JASPERLIB = libjasper/libjasper.a INTERNAL_JASPERHDR_DIR = $(SRCDIR)/$(SUBDIR)/libjasper/include +ifneq ($(JASPERHDR_DIR),NONE) + ifneq ($(JASPERHDR_DIR)x,x) + EXTERN_INCLUDES += -I$(JASPERHDR_DIR) + endif +endif + ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB)) ifeq ($(HAVE_INT64),Y) JASPERLIB_DEP = $(JASPERLIB) -- cgit 1.4.1