configure: fix --mandir 1.7
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Jul 15 22:34:31 2010 +0200 (2010-07-15)
branch1.7
changeset 203542d702fd5dd1
parent 2010 12853e4d2c52
child 2046 471acb219d77
configure: fix --mandir

--mandir points to the base dir of the man pages, so
we have to append our man section below given dir.
(transplanted from a8a4d5c9773893fa6978e5f9e1445d1e8185c24a)
Makefile.in
configure
     1.1 --- a/Makefile.in	Sat Jul 03 00:17:54 2010 +0200
     1.2 +++ b/Makefile.in	Thu Jul 15 22:34:31 2010 +0200
     1.3 @@ -54,6 +54,11 @@
     1.4  sed    := @@sed@@
     1.5  
     1.6  ###############################################################################
     1.7 +# Non-configure variables
     1.8 +MAN_SECTION := 1
     1.9 +MAN_SUBDIR := /man$(MAN_SECTION)
    1.10 +
    1.11 +###############################################################################
    1.12  # Sanity checks
    1.13  
    1.14  # Check if Makefile is up to date:
    1.15 @@ -224,11 +229,11 @@
    1.16  	     $(install) -m 644 "$${doc_file}" "$(DESTDIR)$(DOCDIR)"; \
    1.17  	 done
    1.18  
    1.19 -install-man: $(DESTDIR)$(MANDIR)
    1.20 +install-man: $(DESTDIR)$(MANDIR)$(MAN_SUBDIR)
    1.21  	@echo "  INST   'ct-ng.1.gz'"
    1.22 -	@$(install) -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)"
    1.23 +	@$(install) -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)$(MAN_SUBDIR)"
    1.24  
    1.25 -$(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)):
    1.26 +$(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)$(MAN_SUBDIR)):
    1.27  	@echo "  MKDIR  '$@'"
    1.28  	@$(install) -m 755 -d "$@"
    1.29  
     2.1 --- a/configure	Sat Jul 03 00:17:54 2010 +0200
     2.2 +++ b/configure	Thu Jul 15 22:34:31 2010 +0200
     2.3 @@ -408,7 +408,7 @@
     2.4  [ -z "${BINDIR_set}" ] && BINDIR="${PREFIX}/bin"
     2.5  [ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib"
     2.6  [ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc"
     2.7 -[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man/man1"
     2.8 +[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man"
     2.9  
    2.10  # Install support files in our own sub-dir, so as not to mangle (system)
    2.11  # files and dirs, but only if not --local