diff options
| -rw-r--r-- | GNUmakefile | 12 | ||||
| -rw-r--r-- | analyzer/Makefile | 2 | ||||
| -rw-r--r-- | converter/other/Makefile | 2 | ||||
| -rw-r--r-- | converter/pbm/Makefile | 2 | ||||
| -rw-r--r-- | converter/ppm/hpcdtoppm/Makefile | 4 | ||||
| -rw-r--r-- | editor/Makefile | 2 | ||||
| -rw-r--r-- | editor/specialty/Makefile | 2 | ||||
| -rw-r--r-- | other/Makefile | 2 |
8 files changed, 8 insertions, 20 deletions
diff --git a/GNUmakefile b/GNUmakefile index f344282f..3a02ea03 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -374,18 +374,6 @@ netpbm:%:%.o $(OBJECT_DEP) $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT) netpbm.o: mergetrylist -install.merge: local.install.merge -.PHONY: local.install.merge -local.install.merge: - cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmnoraw - cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm gemtopbm - cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnminterp - cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pgmoil - cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm ppmtojpeg - cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm bmptoppm - cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pgmnorm - cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmfile - ifneq ($(NETPBMLIBTYPE),unixstatic) install.lib: lib/install.lib else diff --git a/analyzer/Makefile b/analyzer/Makefile index abd87d7c..459f0e60 100644 --- a/analyzer/Makefile +++ b/analyzer/Makefile @@ -51,7 +51,7 @@ all: $(BINARIES) include $(SRCDIR)/common.mk -install.bin: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. diff --git a/converter/other/Makefile b/converter/other/Makefile index b01f66ae..02774e81 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -248,7 +248,7 @@ bmptopnm.o bmptopnm.o2: bmp.h pamtotga.o pamtotga.o2: tga.h -install.bin: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. diff --git a/converter/pbm/Makefile b/converter/pbm/Makefile index b74bbb68..e7b0cee9 100644 --- a/converter/pbm/Makefile +++ b/converter/pbm/Makefile @@ -74,7 +74,7 @@ thinkjettopbm.c:%.c:%.c1 $(SRCDIR)/lib/util/lexheader grep -v "^[[:space:]]*int yywrap(void);" \ >$@ -install.bin: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. diff --git a/converter/ppm/hpcdtoppm/Makefile b/converter/ppm/hpcdtoppm/Makefile index ddf79ee5..59ba3630 100644 --- a/converter/ppm/hpcdtoppm/Makefile +++ b/converter/ppm/hpcdtoppm/Makefile @@ -14,12 +14,12 @@ MERGE_OBJECTS = include $(SRCDIR)/common.mk -install: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin # In June 2002, pcdovtoppm replaced pcdindex cd $(PKGDIR)/bin ; \ - $(SYMLINK) pcdindex$(EXE) pcdovtoppm$(EXE) + $(SYMLINK) pcdovtoppm$(EXE) pcdindex$(EXE) FORCE: diff --git a/editor/Makefile b/editor/Makefile index 159f8ea7..680f09a9 100644 --- a/editor/Makefile +++ b/editor/Makefile @@ -56,7 +56,7 @@ all: $(BINARIES) $(SUBDIRS:%=%/all) include $(SRCDIR)/common.mk -install.bin: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin diff --git a/editor/specialty/Makefile b/editor/specialty/Makefile index 427c2c8f..0599cf72 100644 --- a/editor/specialty/Makefile +++ b/editor/specialty/Makefile @@ -46,7 +46,7 @@ all: $(BINARIES) include $(SRCDIR)/common.mk -install.bin: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin diff --git a/other/Makefile b/other/Makefile index bd2c9dc2..3314aede 100644 --- a/other/Makefile +++ b/other/Makefile @@ -52,7 +52,7 @@ include $(SRCDIR)/common.mk ppmsvgalib: LDFLAGS_TARGET = $(shell $(LIBOPT) $(LINUXSVGALIB)) -install.bin: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. |