summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-01-19 10:06:56 -0500
committerGaetan Nadon <memsize@videotron.ca>2011-01-19 10:06:56 -0500
commit8a59f14ff4a87b96ce763dd6565d776f8ac3b087 (patch)
treedb081940410d89e694508449219816bb994947f4
parentbc64aa2a2481130a02bfe41523863b7006d0c3a9 (diff)
config: move man pages into their own directory
Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--Makefile.am14
-rw-r--r--configure.ac5
-rw-r--r--man/Makefile.am12
-rw-r--r--man/xrdb.man (renamed from xrdb.man)0
4 files changed, 17 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 8cbacce..251261b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xrdb
AM_CFLAGS = $(CWARNFLAGS) $(XRDB_CFLAGS)
@@ -27,16 +28,7 @@ xrdb_LDADD = $(XRDB_LIBS)
xrdb_SOURCES = \
xrdb.c
-appman_PRE = \
- xrdb.man
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
.PHONY: ChangeLog INSTALL
@@ -48,8 +40,4 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/configure.ac b/configure.ac
index 2a7899f..0a8edc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,4 +85,7 @@ AC_DEFINE_UNQUOTED([CPP], "$CPP_PATH", [Path to CPP program])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XRDB, xmuu x11)
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+ Makefile
+ man/Makefile])
+AC_OUTPUT
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..95a4ed5
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xrdb.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/xrdb.man b/man/xrdb.man
index e30b0d5..e30b0d5 100644
--- a/xrdb.man
+++ b/man/xrdb.man