From f58e0bcca234fb86d933d80b9d359183361ea907 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sat, 1 Mar 2014 21:54:21 +0000 Subject: Fix missing .exe on copies of programs under old names git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2146 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- analyzer/Makefile | 4 ++-- converter/other/Makefile | 18 +++++++++--------- converter/pbm/Makefile | 2 +- converter/ppm/hpcdtoppm/Makefile | 2 +- doc/HISTORY | 3 +++ editor/Makefile | 30 +++++++++++++++--------------- editor/specialty/Makefile | 4 ++-- other/Makefile | 12 ++++++------ 8 files changed, 39 insertions(+), 36 deletions(-) diff --git a/analyzer/Makefile b/analyzer/Makefile index 3ff7617d..c96a6d0a 100644 --- a/analyzer/Makefile +++ b/analyzer/Makefile @@ -40,9 +40,9 @@ install.bin: install.bin.local install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. cd $(PKGDIR)/bin ; \ - $(SYMLINK) pamslice$(EXE) pgmslice + $(SYMLINK) pamslice$(EXE) pgmslice$(EXE) cd $(PKGDIR)/bin ; \ - $(SYMLINK) pamfile$(EXE) pnmfile + $(SYMLINK) pamfile$(EXE) pnmfile$(EXE) FORCE: diff --git a/converter/other/Makefile b/converter/other/Makefile index 35f420f2..1a44017f 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -283,34 +283,34 @@ install.bin.local: $(PKGDIR)/bin $(SYMLINK) pnmtoplainpnm pnmnoraw # backward compatibility: program used to be gemtopbm cd $(PKGDIR)/bin ; \ - $(SYMLINK) gemtopnm$(EXE) gemtopbm + $(SYMLINK) gemtopnm$(EXE) gemtopbm$(EXE) # In October 2001, pnmtojpeg replaced ppmtojpeg ifneq ($(JPEGLIB),NONE) cd $(PKGDIR)/bin ; \ - $(SYMLINK) pnmtojpeg$(EXE) ppmtojpeg + $(SYMLINK) pnmtojpeg$(EXE) ppmtojpeg$(EXE) endif # In March 2002, bmptopnm replaced bmptoppm cd $(PKGDIR)/bin ; \ - $(SYMLINK) bmptopnm$(EXE) bmptoppm + $(SYMLINK) bmptopnm$(EXE) bmptoppm$(EXE) # In May 2002, pamtouil replaced ppmtouil cd $(PKGDIR)/bin ; \ - $(SYMLINK) pamtouil$(EXE) ppmtouil + $(SYMLINK) pamtouil$(EXE) ppmtouil$(EXE) # In March 2005, we realized that pamtopnm obviates pnmtopnm cd $(PKGDIR)/bin ; \ - $(SYMLINK) pamtopnm$(EXE) pnmtopnm + $(SYMLINK) pamtopnm$(EXE) pnmtopnm$(EXE) # In October 2005, pamtofits replaced pnmtofits cd $(PKGDIR)/bin ; \ - $(SYMLINK) pamtofits$(EXE) pnmtofits + $(SYMLINK) pamtofits$(EXE) pnmtofits$(EXE) ifneq ($(TIFF_PREREQ_MISSING),Y) # In October 2005, pamtotiff replaced pnmtotiff cd $(PKGDIR)/bin ; \ - $(SYMLINK) pamtotiff$(EXE) pnmtotiff + $(SYMLINK) pamtotiff$(EXE) pnmtotiff$(EXE) endif ifeq ($(HAVE_PNGLIB),Y) # In September 2009, pngtopam replaced pngtopnm cd $(PKGDIR)/bin ; \ - $(SYMLINK) pngtopam$(EXE) pngtopnm + $(SYMLINK) pngtopam$(EXE) pngtopnm$(EXE) endif # In December 2010, sunicontopnm replaced icontopbm cd $(PKGDIR)/bin ; \ - $(SYMLINK) sunicontopnm icontopbm + $(SYMLINK) sunicontopnm$(EXE) icontopbm$(EXE) diff --git a/converter/pbm/Makefile b/converter/pbm/Makefile index 487bd752..602cb156 100644 --- a/converter/pbm/Makefile +++ b/converter/pbm/Makefile @@ -79,7 +79,7 @@ install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. # In December 2010 (Actually January 2011), pbmtosunicon replaced pbmtoicon cd $(PKGDIR)/bin ; \ - $(SYMLINK) pbmtosunicon pbmtoicon + $(SYMLINK) pbmtosunicon$(EXE) pbmtoicon$(EXE) thisdirclean: localclean .PHONY: localclean diff --git a/converter/ppm/hpcdtoppm/Makefile b/converter/ppm/hpcdtoppm/Makefile index 91aefc5b..ddf79ee5 100644 --- a/converter/ppm/hpcdtoppm/Makefile +++ b/converter/ppm/hpcdtoppm/Makefile @@ -19,7 +19,7 @@ install: install.bin.local install.bin.local: $(PKGDIR)/bin # In June 2002, pcdovtoppm replaced pcdindex cd $(PKGDIR)/bin ; \ - $(SYMLINK) pcdindex$(EXE) pcdovtoppm + $(SYMLINK) pcdindex$(EXE) pcdovtoppm$(EXE) FORCE: diff --git a/doc/HISTORY b/doc/HISTORY index f726aa7f..137b5d88 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -62,6 +62,9 @@ not yet BJH Release 10.66.00 Windows build: fix Ppmtompeg build failure in non-Cygwin build due to missing sys/utsname.h. + Windows build: fix missing .exe on copies of programs under + their old names. + 13.12.26 BJH Release 10.65.00 pamfunc: add -changemaxval. diff --git a/editor/Makefile b/editor/Makefile index f3236536..398c4aea 100644 --- a/editor/Makefile +++ b/editor/Makefile @@ -63,34 +63,34 @@ install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. # backward compatibility: program used to be pnminterp cd $(PKGDIR)/bin ; \ - rm -f pnminterp; \ - $(SYMLINK) pamstretch$(EXE) pnminterp + rm -f pnminterp$(EXE); \ + $(SYMLINK) pamstretch$(EXE) pnminterp$(EXE) # In March 2002, pnmnorm replaced ppmnorm and pgmnorm cd $(PKGDIR)/bin ; \ - rm -f ppmnorm ; \ - $(SYMLINK) pnmnorm$(EXE) ppmnorm + rm -f ppmnorm$(EXE) ; \ + $(SYMLINK) pnmnorm$(EXE) ppmnorm$(EXE) cd $(PKGDIR)/bin ; \ - rm -f pgmnorm ; \ - $(SYMLINK) pnmnorm$(EXE) pgmnorm + rm -f pgmnorm$(EXE) ; \ + $(SYMLINK) pnmnorm$(EXE) pgmnorm$(EXE) # In March 2003, pamedge replaced pgmedge cd $(PKGDIR)/bin ; \ - rm -f pgmedge ; \ - $(SYMLINK) pamedge$(EXE) pgmedge + rm -f pgmedge$(EXE) ; \ + $(SYMLINK) pamedge$(EXE) pgmedge$(EXE) # In October 2004, pamenlarge replaced pnmenlarge cd $(PKGDIR)/bin ; \ - rm -f pnmenlarge ; \ - $(SYMLINK) pamenlarge$(EXE) pnmenlarge + rm -f pnmenlarge$(EXE) ; \ + $(SYMLINK) pamenlarge$(EXE) pnmenlarge$(EXE) # In March 2009, pamcut replaced pnmcut (but pamcut is much older -- pnmcut # was obsoleted by pamcut long before this). cd $(PKGDIR)/bin ; \ - rm -f pnmcut ; \ - $(SYMLINK) pamcut$(EXE) pnmcut + rm -f pnmcut$(EXE) ; \ + $(SYMLINK) pamcut$(EXE) pnmcut$(EXE) # In March 2009, pamscale replaced pnmscale (but pamscale is much older -- # pnmscale was obsoleted by pamscale long before this). cd $(PKGDIR)/bin ; \ - rm -f pnmscale ; \ - $(SYMLINK) pamscale$(EXE) pnmscale + rm -f pnmscale$(EXE) ; \ + $(SYMLINK) pamscale$(EXE) pnmscale$(EXE) # In March 2012, pnmquantall replaced ppmquantall cd $(PKGDIR)/bin ; \ - rm -f ppmquantall ; \ + rm -f ppmquantall$(EXE) ; \ $(SYMLINK) pnmquantall ppmquantall diff --git a/editor/specialty/Makefile b/editor/specialty/Makefile index 4d832886..427c2c8f 100644 --- a/editor/specialty/Makefile +++ b/editor/specialty/Makefile @@ -53,5 +53,5 @@ install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. # pamoil replaced pgmoil in June 2001. cd $(PKGDIR)/bin ; \ - rm -f pgmoil ; \ - $(SYMLINK) pamoil$(EXE) pgmoil + rm -f pgmoil$(EXE) ; \ + $(SYMLINK) pamoil$(EXE) pgmoil$(EXE) diff --git a/other/Makefile b/other/Makefile index f2690e05..1c25d6a6 100644 --- a/other/Makefile +++ b/other/Makefile @@ -61,15 +61,15 @@ install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. # In July 2002, pamarith replaced pnmarith cd $(PKGDIR)/bin ; \ - rm -f pnmarith ; \ - $(SYMLINK) pamarith$(EXE) pnmarith + rm -f pnmarith$(EXE) ; \ + $(SYMLINK) pamarith$(EXE) pnmarith$(EXE) # In December 2005, pamsplit replaced pnmsplit cd $(PKGDIR)/bin ; \ - rm -f pnmsplit ; \ - $(SYMLINK) pamsplit$(EXE) pnmsplit + rm -f pnmsplit$(EXE) ; \ + $(SYMLINK) pamsplit$(EXE) pnmsplit$(EXE) # In February 2006, pamdepth replaced pnmdepth cd $(PKGDIR)/bin ; \ - rm -f pnmdepth ; \ - $(SYMLINK) pamdepth$(EXE) pnmdepth + rm -f pnmdepth$(EXE) ; \ + $(SYMLINK) pamdepth$(EXE) pnmdepth$(EXE) FORCE: -- cgit 1.4.1