about summary refs log tree commit diff
path: root/converter
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-10-23 19:09:38 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-10-23 19:09:38 +0000
commitf83833dd6f1f8deb2faa5686da22991f58087f56 (patch)
tree96313cc382cc3171e269f5cd0c759af956710409 /converter
parent3b85c09e19ebdd0f54e49d1626f0bef0edd8ec5d (diff)
downloadnetpbm-mirror-f83833dd6f1f8deb2faa5686da22991f58087f56.tar.gz
netpbm-mirror-f83833dd6f1f8deb2faa5686da22991f58087f56.tar.xz
netpbm-mirror-f83833dd6f1f8deb2faa5686da22991f58087f56.zip
Rename icontopbm to sunicontopnm
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1342 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
-rw-r--r--converter/other/Makefile2
-rw-r--r--converter/other/sunicontopnm.c (renamed from converter/pbm/icontopbm.c)0
-rw-r--r--converter/pbm/Makefile10
3 files changed, 10 insertions, 2 deletions
diff --git a/converter/other/Makefile b/converter/other/Makefile
index cded8f33..c2cbb0a9 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -87,7 +87,7 @@ PORTBINARIES =  avstopam bmptopnm fitstopnm \
 	        pgmtopbm pgmtoppm ppmtopgm pnmtoddif \
 		pnmtopclxl \
 		pnmtosgi pnmtosir pamtotga pnmtoxwd \
-		rlatopam sgitopnm sirtopnm xwdtopnm zeisstopnm
+		rlatopam sgitopnm sirtopnm sunicontopnm xwdtopnm zeisstopnm
 
 ifneq ($(DONT_HAVE_PROCESS_MGMT),Y)
   PORTBINARIES += pstopnm
diff --git a/converter/pbm/icontopbm.c b/converter/other/sunicontopnm.c
index bad47c24..bad47c24 100644
--- a/converter/pbm/icontopbm.c
+++ b/converter/other/sunicontopnm.c
diff --git a/converter/pbm/Makefile b/converter/pbm/Makefile
index 0461eedc..07b768c0 100644
--- a/converter/pbm/Makefile
+++ b/converter/pbm/Makefile
@@ -9,7 +9,7 @@ include $(BUILDDIR)/config.mk
 
 PORTBINARIES =	atktopbm brushtopbm cistopbm cmuwmtopbm \
 		ddbugtopbm g3topbm escp2topbm \
-		icontopbm macptopbm mdatopbm mgrtopbm mrftopbm \
+		macptopbm mdatopbm mgrtopbm mrftopbm \
 		pbmto10x pbmto4425 pbmtoascii pbmtoatk \
 		pbmtobbnbg pbmtocis pbmtocmuwm pbmtodjvurle \
 		pbmtoepsi pbmtoepson pbmtoescp2 \
@@ -73,6 +73,14 @@ thinkjettopbm.c:%.c:%.c1 $(SRCDIR)/lib/util/lexheader
 	  grep -v "^[[:space:]]*int yywrap(void);" \
 	  >$@
 
+install.bin: install.bin.local
+.PHONY: install.bin.local
+install.bin.local: $(PKGDIR)/bin
+# Remember that $(SYMLINK) might just be a copy command.
+# In December 2010, sunicontopnm replaced icontopbm
+	cd $(PKGDIR)/bin ; \
+	$(SYMLINK) sunicontopnm icontopbm
+
 thisdirclean: localclean
 .PHONY: localclean
 localclean: