diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-04-17 03:06:55 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-04-17 03:06:55 +0000 |
| commit | daf35c1b334b76ba0d66d872cf9fb50864bacba9 (patch) | |
| tree | 77dcf5ffcc0e8fba689ba8291921e8ef10f0e9b9 | |
| parent | afeba6f777395e88276ad2a00bdbb60af04773aa (diff) | |
| download | netpbm-mirror-daf35c1b334b76ba0d66d872cf9fb50864bacba9.tar.gz netpbm-mirror-daf35c1b334b76ba0d66d872cf9fb50864bacba9.tar.xz netpbm-mirror-daf35c1b334b76ba0d66d872cf9fb50864bacba9.zip | |
Fix 'make package' with PKGMANDIR override in config.mk
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2462 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | GNUmakefile | 4 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index ed8795ca..1647bd57 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -386,9 +386,9 @@ install.lib: endif .PHONY: install.manwebmain -install.manwebmain: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url +install.manwebmain: $(PKGDIR)/$(PKGMANDIR)/web/netpbm.url $(PKGDIR)/bin/doc.url -$(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web +$(PKGDIR)/$(PKGMANDIR)/web/netpbm.url: $(PKGDIR)/$(PKGMANDIR)/web echo "$(NETPBM_DOCURL)" > $@ chmod $(INSTALL_PERM_MAN) $@ diff --git a/common.mk b/common.mk index 48c63c69..97413530 100644 --- a/common.mk +++ b/common.mk @@ -515,8 +515,6 @@ install.man: install.man1 install.man3 install.man5 \ MANUALS1 = $(BINARIES) $(SCRIPTS) -PKGMANDIR = man - install.man1: $(MANUALS1:%=%_installman1) install.man3: $(MANUALS3:%=%_installman3) diff --git a/doc/HISTORY b/doc/HISTORY index d9316206..ff6f6f27 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -20,6 +20,9 @@ not yet BJH Release 10.71.00 Build: work around bug in GCC < 4.2 related to SSE2 builtins that causes compile of pamflip to fail. + Build: fix 'make package' where config.mk sets a subdirectory + other than 'man' for the manual. + 15.03.29 BJH Release 10.70.00 Add st4topgm, pgmtost4. |