From 11c957c2160d40b3339d162d95fe0376df31d84f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 15 Jul 2010 22:34:31 +0200
Subject: 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 --git a/Makefile.in b/Makefile.in
index 1ccf8fd..d0b63ee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,6 +59,11 @@ readelf:= @@readelf@@
 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-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 "$@"
 
diff --git a/configure b/configure
index 3d88457..91574d2 100755
--- a/configure
+++ b/configure
@@ -413,7 +413,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
-- 
cgit v0.10.2-6-g49f6