diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-03-29 21:17:12 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-03-29 21:17:12 +0000 |
| commit | 0650b25ed6a0123e58c76616fef606fd3f8ad799 (patch) | |
| tree | 76f2051a92fc6e93c06d2d4af44bf3f1178c0454 /converter | |
| parent | c85e6aae67d557791c2e15992d2df2839a5d0bf6 (diff) | |
| download | netpbm-mirror-0650b25ed6a0123e58c76616fef606fd3f8ad799.tar.gz netpbm-mirror-0650b25ed6a0123e58c76616fef606fd3f8ad799.tar.xz netpbm-mirror-0650b25ed6a0123e58c76616fef606fd3f8ad799.zip | |
Release 10.47.49
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2165 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/other/Makefile | 16 | ||||
| -rw-r--r-- | converter/ppm/hpcdtoppm/Makefile | 2 | ||||
| -rw-r--r-- | converter/ppm/ppmtompeg/Makefile | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/converter/other/Makefile b/converter/other/Makefile index 8277b127..ff87c8b8 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -222,26 +222,26 @@ 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 -endif \ No newline at end of file + $(SYMLINK) pamtotiff$(EXE) pnmtotiff$(EXE) +endif 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/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile index d3342c9a..a1004fdd 100644 --- a/converter/ppm/ppmtompeg/Makefile +++ b/converter/ppm/ppmtompeg/Makefile @@ -56,7 +56,7 @@ ifeq ($(OMIT_NETWORK),y) else MP_OTHER_OBJS += parallel.o psocket.o endif -ifeq ($(WIN32),y) +ifeq ($(MSVCRT),Y) MP_OTHER_OBJS += gethostname_win32.o else MP_OTHER_OBJS += gethostname.o |