about summary refs log tree commit diff
path: root/converter/other
diff options
context:
space:
mode:
Diffstat (limited to 'converter/other')
-rw-r--r--converter/other/Makefile3
-rw-r--r--converter/other/jpeg2000/Makefile2
2 files changed, 4 insertions, 1 deletions
diff --git a/converter/other/Makefile b/converter/other/Makefile
index 294eefc4..746db87c 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -310,3 +310,6 @@ ifeq ($(HAVE_PNGLIB),Y)
 	cd $(PKGDIR)/bin ; \
 	$(SYMLINK) pngtopam$(EXE) pngtopnm
 endif
+# In December 2010, sunicontopnm replaced icontopbm
+	cd $(PKGDIR)/bin ; \
+	$(SYMLINK) sunicontopnm icontopbm
diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile
index f4fee87f..f2e3b4a1 100644
--- a/converter/other/jpeg2000/Makefile
+++ b/converter/other/jpeg2000/Makefile
@@ -57,7 +57,7 @@ all: $(BINARIES)
 
 include $(SRCDIR)/common.mk
 
-LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE))
+LIBOPTS = $(shell $(LIBOPT) $(JASPERLIB_USE) $(NETPBMLIB))
 
 $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT)
 	$(LD) -o $@ $< \