about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2014-06-24 03:34:39 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2014-06-24 03:34:39 +0000
commitec7b54b6b71a38121a6921b444396c3a39124bc2 (patch)
tree19be5438b72594348f972d98d738d6e53837ee4f
parent6a2d3f886590ecede5ac0d6346746fd6cd7d2f18 (diff)
downloadnetpbm-mirror-ec7b54b6b71a38121a6921b444396c3a39124bc2.tar.gz
netpbm-mirror-ec7b54b6b71a38121a6921b444396c3a39124bc2.tar.xz
netpbm-mirror-ec7b54b6b71a38121a6921b444396c3a39124bc2.zip
Missing from recent commit to change structure of jbig directory
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2208 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--config.mk.in4
-rwxr-xr-xtest/ppmcie.test6
2 files changed, 5 insertions, 5 deletions
diff --git a/config.mk.in b/config.mk.in
index b10ddbb3..35d77bb4 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -468,8 +468,8 @@ ZHDR_DIR =
 
 # The JBIG lossless image compression library (aka JBIG-KIT):
 
-JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
-JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
+JBIGLIB = $(INTERNAL_JBIG_LIB)
+JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR)
 
 # The Jasper JPEG-2000 image compression library (aka JasPer):
 JASPERLIB = $(INTERNAL_JASPERLIB)
diff --git a/test/ppmcie.test b/test/ppmcie.test
index 2584ece4..c4338195 100755
--- a/test/ppmcie.test
+++ b/test/ppmcie.test
@@ -40,8 +40,8 @@ pamsumm --mean --brief ${tmpdir}/ppmcie.ppm | \
 # x86 64 bit: 0.002478
 
 pamsharpness ${tmpdir}/ppmcie.ppm 2>&1 | \
-  awk 'NF==4 && $2=="Sharpness" \
-       {if (0.002475 < $4 && $4 < 0.002479) print "ok"; else print $4}
-       NF>0 && NF!=4 {print "error"}'
+  awk 'NF==3 && $1=="Sharpness" \
+       {if (0.002475 < $3 && $3 < 0.002479) print "ok"; else print $3}
+       NF>0 && NF!=3 {print "error"}'
 
 rm ${tmpdir}/ppmcie.ppm