# HG changeset patch # User "Yann E. MORIN" # Date 1279226071 -7200 # Node ID a8a4d5c9773893fa6978e5f9e1445d1e8185c24a # Parent b38f4954e4ede35686d754b55dfc81ac2d273bfc configure: fix --mandir --mandir points to the base dir of the man pages, so we have to append our man section below given dir. diff -r b38f4954e4ed -r a8a4d5c97738 Makefile.in --- a/Makefile.in Thu Jul 15 10:18:40 2010 +0200 +++ b/Makefile.in Thu Jul 15 22:34:31 2010 +0200 @@ -59,6 +59,11 @@ patch := @@patch@@ ############################################################################### +# Non-configure variables +MAN_SECTION := 1 +MAN_SUBDIR := /man$(MAN_SECTION) + +############################################################################### # Sanity checks # Check if Makefile is up to date: @@ -241,11 +246,11 @@ $(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 "$@" diff -r b38f4954e4ed -r a8a4d5c97738 configure --- a/configure Thu Jul 15 10:18:40 2010 +0200 +++ b/configure Thu Jul 15 22:34:31 2010 +0200 @@ -413,7 +413,7 @@ [ -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