diff options
| -rw-r--r-- | GNUmakefile | 6 | ||||
| -rw-r--r-- | common.mk | 27 | ||||
| -rw-r--r-- | doc/HISTORY | 3 |
3 files changed, 29 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile index 035a8ed5..eaf1ade3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -258,10 +258,10 @@ endif .PHONY: install-merge install-nonmerge install-merge: install.merge install.lib install.data \ - install.manweb install.man + install.manwebmain install.manweb install.man install-nonmerge: install.bin install.lib install.data \ - install.manweb install.man + install.manwebmain install.manweb install.man .PHONY: merge merge: lib/all netpbm @@ -367,7 +367,7 @@ install.lib: endif .PHONY: install.manweb -install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url +install.manwebmain: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url $(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web echo "$(NETPBM_DOCURL)" > $@ diff --git a/common.mk b/common.mk index c096bd6e..51fbc438 100644 --- a/common.mk +++ b/common.mk @@ -449,7 +449,17 @@ ifeq ($(SYMLINKEXE)x,x) SYMLINKEXE := $(SYMLINK) endif -$(PKGDIR)/%: +# An implicit rule for $(PKGDIR)/% does not work because it causes Make +# sometimes to believe the directory it creates from this rule is an unneeded +# intermediate file and try to delete it later. So we explicitly list the +# possible directories under $(PKGDIR): + +PKGMANSUBDIRS = man1 man3 man5 web + +PKGSUBDIRS = bin include include/netpbm lib link misc \ + $(PKGMANSUBDIRS:%=$(PKGMANDIR)/%) + +$(PKGSUBDIRS:%=$(PKGDIR)/%): $(SRCDIR)/buildtools/mkinstalldirs $@ .PHONY: install.merge @@ -493,11 +503,13 @@ MANUALS1 = $(BINARIES) $(SCRIPTS) PKGMANDIR = man -install.man1: $(PKGDIR)/$(PKGMANDIR)/man1 $(MANUALS1:%=%_installman1) +install.man1: $(MANUALS1:%=%_installman1) + +install.man3: $(MANUALS3:%=%_installman3) -install.man3: $(PKGDIR)/$(PKGMANDIR)/man3 $(MANUALS3:%=%_installman3) +install.man5: $(MANUALS5:%=%_installman5) -install.man5: $(PKGDIR)/$(PKGMANDIR)/man5 $(MANUALS5:%=%_installman5) +install.manweb: $(MANUALS1:%=%_installmanweb) $(SUBDIRS:%=%/install.manweb) %_installman1: $(PKGDIR)/$(PKGMANDIR)/man1 perl -w $(SRCDIR)/buildtools/makepointerman $(@:%_installman1=%) \ @@ -511,6 +523,10 @@ install.man5: $(PKGDIR)/$(PKGMANDIR)/man5 $(MANUALS5:%=%_installman5) perl -w $(SRCDIR)/buildtools/makepointerman $(@:%_installman5=%) \ $(NETPBM_DOCURL) $< 5 $(MANPAGE_FORMAT) $(INSTALL_PERM_MAN) +%_installmanweb: $(PKGDIR)/$(PKGMANDIR)/web + echo $(NETPBM_DOCURL)$(@:%_installmanweb=%).html \ + >$</$(@:%_installmanweb=%).url + .PHONY: clean ifneq ($(EXE)x,x) @@ -556,6 +572,9 @@ endif %/install.man: $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) +%/install.manweb: + $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ + SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) %/install.data: $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) diff --git a/doc/HISTORY b/doc/HISTORY index 00d7e183..26e10ebb 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -16,6 +16,9 @@ not yet BJH Release 10.66.00 pstopnm: fix wrong orientation sometimes when you specify both -xsize and -ysize. Introduced in 10.65. + make package: Include a man/web directory with .url files for + each manual page. + 13.12.26 BJH Release 10.65.00 pamfunc: add -changemaxval. |