diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-02-20 02:49:16 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-02-20 02:49:16 +0000 |
commit | 7978eb4927aba6681ff912fe355e6e6bd84ef526 (patch) | |
tree | 6e17458a415f864a8a2e7953d5ae4819093c7e6c /converter/other | |
parent | 67291597b49a9b5b8f26ad7cb58932b07573df3a (diff) | |
download | netpbm-mirror-7978eb4927aba6681ff912fe355e6e6bd84ef526.tar.gz netpbm-mirror-7978eb4927aba6681ff912fe355e6e6bd84ef526.tar.xz netpbm-mirror-7978eb4927aba6681ff912fe355e6e6bd84ef526.zip |
Release 10.61.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@1851 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
-rw-r--r-- | converter/other/Makefile | 3 | ||||
-rw-r--r-- | converter/other/jpeg2000/Makefile | 2 |
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 $@ $< \ |