[PATCH app-xdm 1/5] config: move man pages into their own directory

[Gaetan Nadon]

Replace lowercase $(xdmlibdir) with $(XXDMLIBDIR)

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am                          |   37 ++---------------------
 configure.ac                         |    6 +++-
 man/Makefile.am                      |   55 ++++++++++++++++++++++++++++++++++
 xdm.man.cpp => man/xdm.man           |    0
 xdmshell.man.cpp => man/xdmshell.man |    0
 5 files changed, 63 insertions(+), 35 deletions(-)
 create mode 100644 man/Makefile.am
 rename xdm.man.cpp => man/xdm.man (100%)
 rename xdmshell.man.cpp => man/xdmshell.man (100%)

diff --git a/Makefile.am b/Makefile.am
index b5c6859..de77c8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,20 +19,15 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = config greeter
+SUBDIRS = config greeter man
 
 bin_PROGRAMS = xdm
 noinst_PROGRAMS =
 
-appman_PRE = xdm.man.cpp
-noinst_man_PRE =
-
 if INSTALL_XDMSHELL
 bin_PROGRAMS += xdmshell
-appman_PRE += xdmshell.man.cpp
 else
 noinst_PROGRAMS += xdmshell
-noinst_man_PRE += xdmshell.man.cpp
 endif
 
 xdmlibdir = $(XDMLIBDIR)
@@ -97,34 +92,6 @@ xdm_SOURCES += krb5auth.c
 endif
 
 #
-#  xdm man page 
-#
-
-appmandir = $(APP_MAN_DIR)
-appman_DATA = $(appman_PRE:man.cpp=@APP_MAN_SUFFIX@)
-noinst_DATA = $(noinst_man_PRE:man.cpp=@APP_MAN_SUFFIX@)
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA) $(noinst_DATA)
-EXTRA_DIST = $(appman_PRE) $(noinst_man_PRE)
-SUFFIXES   = .$(APP_MAN_SUFFIX) .man.cpp
-
-MAN_SUBSTS +=	-e 's|CHOOSERPATH|$(xdmlibdir)/chooser|g' \
-		-e 's|XDMLOGDIR|$(XDMLOGDIR)|g' \
-		-e 's|XDMDIR|$(XDMCONFIGDIR)|g' \
-		-e 's|BINDIR|$(bindir)|g' \
-		-e 's|XDMPIDDIR|$(XDMPIDDIR)|g' \
-		-e 's|XDMXAUTHDIR|$(XDMXAUTHDIR)|g' \
-		-e 's|DEF_USER_PATH|$(DEF_USER_PATH)|g' \
-		-e 's|DEF_SYSTEM_PATH|$(DEF_SYSTEM_PATH)|g' \
-		-e 's|DEF_GREETER_LIB|$(DEF_GREETER_LIB)|g' \
-		-e 's|DEV_RANDOM|$(DEV_RANDOM)|g' \
-		-e 's|ARC4_RANDOM|$(HAVE_ARC4RANDOM)|g'
-
-.man.cpp.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-#
 #  xdmshell
 #
 xdmshell_CFLAGS = $(XDMSHELL_CFLAGS) -DBINDIR="\"$(bindir)\""
@@ -161,6 +128,8 @@ lint:
 	(cd greeter && $(MAKE) $(AM_MAKEFLAGS) lint)
 endif LINT
 
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
diff --git a/configure.ac b/configure.ac
index 66ea73a..e94ee98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,4 +536,8 @@ AC_SUBST(appdefaultdir)
 
 AC_SUBST(MKTEMP_COMMAND)
 
-AC_OUTPUT([Makefile config/Makefile greeter/Makefile])
+AC_CONFIG_FILES([Makefile
+		config/Makefile
+		greeter/Makefile
+		man/Makefile])
+AC_OUTPUT
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..b71409c
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xdm.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+xdmlmandir = $(APP_MAN_DIR)
+xdmlman_PRE = xdmshell.man
+
+if INSTALL_XDMSHELL
+xdmlman_DATA = $(xdmlman_PRE:man=$(APP_MAN_SUFFIX))
+else
+noinst_DATA = $(xdmlman_PRE:man=$(APP_MAN_SUFFIX))
+endif
+
+EXTRA_DIST = $(appman_PRE) $(xdmlman_PRE)
+CLEANFILES = $(appman_DATA) $(xdmlman_DATA) $(noinst_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS +=	-e 's|CHOOSERPATH|$(XDMLIBDIR)/chooser|g' \
+		-e 's|XDMLOGDIR|$(XDMLOGDIR)|g' \
+		-e 's|XDMDIR|$(XDMCONFIGDIR)|g' \
+		-e 's|BINDIR|$(bindir)|g' \
+		-e 's|XDMPIDDIR|$(XDMPIDDIR)|g' \
+		-e 's|XDMXAUTHDIR|$(XDMXAUTHDIR)|g' \
+		-e 's|DEF_USER_PATH|$(DEF_USER_PATH)|g' \
+		-e 's|DEF_SYSTEM_PATH|$(DEF_SYSTEM_PATH)|g' \
+		-e 's|DEF_GREETER_LIB|$(DEF_GREETER_LIB)|g' \
+		-e 's|DEV_RANDOM|$(DEV_RANDOM)|g' \
+		-e 's|ARC4_RANDOM|$(HAVE_ARC4RANDOM)|g'
+
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/xdm.man.cpp b/man/xdm.man
similarity index 100%
rename from xdm.man.cpp
rename to man/xdm.man
diff --git a/xdmshell.man.cpp b/man/xdmshell.man
similarity index 100%
rename from xdmshell.man.cpp
rename to man/xdmshell.man
-- 
1.6.0.4