From d7e14787c49408da8bc52359699dfd06b200d8b5 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sat, 2 May 2015 02:28:29 +0000
Subject: Don't build and install libjjbig, libjasper if we are using external
 versions

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2477 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 converter/other/jpeg2000/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'converter/other/jpeg2000/Makefile')

diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile
index 009232d7..6e5af8e7 100644
--- a/converter/other/jpeg2000/Makefile
+++ b/converter/other/jpeg2000/Makefile
@@ -5,7 +5,7 @@ endif
 SUBDIR = converter/other/jpeg2000
 VPATH=.:$(SRCDIR)/$(SUBDIR)
 
-SUBDIRS = libjasper
+SUBDIRS =
 
 include $(BUILDDIR)/config.mk
 
@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB))
   # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better
   # be relative to the current directory.
   MERGE_OBJECTS += $(JASPERLIB)
+  SUBDIRS += libjasper
 endif
 MERGEBINARIES = $(BINARIES)
 
-- 
cgit 1.4.1