[DTrace-devel] [PATCH 06/14] configure: fix dreadful behaviour of MANDIR / --mandir

[Kris Van Hees]

On Thu, Oct 24, 2024 at 12:37:50PM +0100, Nick Alcock wrote:
> This should obviously refer to the top-level mandir, i.e. PREFIX/share/man,
> not PREFIX/share/man/man8!  Literally no package ever does that, I don't
> know what I was thinking...
> 
> Signed-off-by: Nick Alcock <nick.alcock at oracle.com>
> Bug: https://github.com/oracle/dtrace-utils/issues/106

Bug: before Signed-off-by:

With that...

Reviewed-by: Kris Van Hees <kris.van.hees at oracle.com>

> ---
>  GNUmakefile | 2 +-
>  cmd/Build   | 2 +-
>  configure   | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/GNUmakefile b/GNUmakefile
> index 99960227bcba..e2c4108fec6f 100644
> --- a/GNUmakefile
> +++ b/GNUmakefile
> @@ -96,7 +96,7 @@ INSTSYSTEMDPRESETDIR = $(DESTDIR)$(SYSTEMDPRESETDIR)
>  INSTSYSTEMDUNITDIR = $(DESTDIR)$(SYSTEMDUNITDIR)
>  DOCDIR = $(prefix)/share/doc/dtrace-$(VERSION)
>  INSTDOCDIR = $(DESTDIR)$(DOCDIR)
> -MANDIR = $(prefix)/share/man/man8
> +MANDIR = $(prefix)/share/man
>  INSTMANDIR = $(DESTDIR)$(MANDIR)
>  PKGCONFIGDIR = $(prefix)/share/pkgconfig
>  INSTPKGCONFIGDIR = $(DESTDIR)$(PKGCONFIGDIR)
> diff --git a/cmd/Build b/cmd/Build
> index 68800fbeb5fc..38a538c1e3c9 100644
> --- a/cmd/Build
> +++ b/cmd/Build
> @@ -55,4 +55,4 @@ install::
>  	$(call describe-install-target,$(INSTSBINDIR),dtrace)
>  	install -m 755 $(objdir)/dtrace $(INSTSBINDIR)
>  	$(call describe-install-target,$(INSTMANDIR),dtrace.8)
> -	install -m 644 $(dtrace_DIR)/dtrace.8 $(INSTMANDIR)
> +	install -m 644 $(dtrace_DIR)/dtrace.8 $(INSTMANDIR)/man8
> diff --git a/configure b/configure
> index 0c9fb309c494..4ce64efe4ed3 100755
> --- a/configure
> +++ b/configure
> @@ -58,7 +58,7 @@ Installation paths:
>  --bindir=PREFIX/sbin				Binary directory
>  --sbindir=PREFIX/sbin				Alias for --bindir
>  --includedir=PREFIX/include			#include directory
> ---mandir=PREFIX/share/man/man8			Manpage directory
> +--mandir=PREFIX/share/man			Manpage directory
>  --pkg-config-dir=PREFIX/share/pkgconfig		Pkg-config directory
>  --udevdir=PREFIX/lib/udev/rules.d		udev rules directory
>  --systemd-unit-dir=PREFIX/lib/systemd/system	systemd unit directory
> -- 
> 2.46.0.278.g36e3a12567
>