diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-16 02:21:06 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-16 02:21:06 +0000 |
| commit | f2bc3f905af4da518e86823c3aa4e1251c28a185 (patch) | |
| tree | c05dc913a842d957fe9c774aedf25cbe1dbf5bc9 | |
| parent | 9dc829f60d164490182b1a80af89d037297f2c9a (diff) | |
| download | netpbm-mirror-f2bc3f905af4da518e86823c3aa4e1251c28a185.tar.gz netpbm-mirror-f2bc3f905af4da518e86823c3aa4e1251c28a185.tar.xz netpbm-mirror-f2bc3f905af4da518e86823c3aa4e1251c28a185.zip | |
Make null value properly indicate 'in system search path' for JBIGHDR_DIR and JASPERHDR_DIR
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2201 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/other/jbig/Makefile | 4 | ||||
| -rw-r--r-- | converter/other/jpeg2000/Makefile | 10 | ||||
| -rw-r--r-- | doc/HISTORY | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/converter/other/jbig/Makefile b/converter/other/jbig/Makefile index 30e634f1..ae16a728 100644 --- a/converter/other/jbig/Makefile +++ b/converter/other/jbig/Makefile @@ -11,7 +11,9 @@ LIBJBIG_OBJECTS = jbig.o jbig_tab.o EXTERN_INCLUDES = ifneq ($(JBIGHDR_DIR),NONE) - EXTERN_INCLUDES += -I$(JBIGHDR_DIR) + ifneq ($(JBIGHDR_DIR)x,x) + EXTERN_INCLUDES += -I$(JBIGHDR_DIR) + endif endif ifneq ($(JBIGHDR_DIR),NONE) diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index 4afe4ffd..009232d7 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) diff --git a/doc/HISTORY b/doc/HISTORY index 574b60e4..4bfd91b2 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -39,6 +39,9 @@ not yet BJH Release 10.67.00 Windows build: include an icon in every executable. The icon was designed by Ron Vantreese (ait_frog-netpbm@yahoo.com). + Build: fix bug in which null value is not taken to mean + "in the system search path" for JBIGHDR_DIR and JASPERHDR_DIR. + Build: Fix inconsistent use of upper and lower case Y and N in make variables, causing static library not to get built. Introduced in 10.66. |