diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-07-15 20:34:31 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-07-15 20:34:31 (GMT) |
commit | 82d882fd286902b15d7ebacb0bd9a10ef986abf2 (patch) | |
tree | bb9ea6c8d340301207c152f1630c150271538525 | |
parent | 611b74e36a5a1ad7b1424dc1705c4edf2eae3666 (diff) |
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)
-rw-r--r-- | Makefile.in | 11 | ||||
-rwxr-xr-x | configure | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 6080fdf..7740527 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,6 +54,11 @@ make := @@make@@ sed := @@sed@@ ############################################################################### +# Non-configure variables +MAN_SECTION := 1 +MAN_SUBDIR := /man$(MAN_SECTION) + +############################################################################### # Sanity checks # Check if Makefile is up to date: @@ -224,11 +229,11 @@ install-doc: $(DESTDIR)$(DOCDIR) $(install) -m 644 "$${doc_file}" "$(DESTDIR)$(DOCDIR)"; \ done -install-man: $(DESTDIR)$(MANDIR) +install-man: $(DESTDIR)$(MANDIR)$(MAN_SUBDIR) @echo " INST 'ct-ng.1.gz'" - @$(install) -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)" + @$(install) -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)$(MAN_SUBDIR)" -$(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)): +$(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)$(MAN_SUBDIR)): @echo " MKDIR '$@'" @$(install) -m 755 -d "$@" @@ -408,7 +408,7 @@ printf "${VERSION}\n" [ -z "${BINDIR_set}" ] && BINDIR="${PREFIX}/bin" [ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib" [ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc" -[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man/man1" +[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man" # Install support files in our own sub-dir, so as not to mangle (system) # files and dirs, but only if not --local |