diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-16 02:46:44 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-16 02:46:44 +0000 |
| commit | 5b2ab4418541e294abff56a37d861a4f1cc38db9 (patch) | |
| tree | 2c0bdbfe01dc3ed6c46b067557a924b6d4af47af /converter/other/jpeg2000 | |
| parent | 15a1a702e2fc9e590820a377d766a8c23ed0dc2b (diff) | |
| download | netpbm-mirror-5b2ab4418541e294abff56a37d861a4f1cc38db9.tar.gz netpbm-mirror-5b2ab4418541e294abff56a37d861a4f1cc38db9.tar.xz netpbm-mirror-5b2ab4418541e294abff56a37d861a4f1cc38db9.zip | |
Release 10.66.03
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2204 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/jpeg2000')
| -rw-r--r-- | converter/other/jpeg2000/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
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) |