diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:56 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:56 -0500 |
| commit | 29215ba31a7e173e55e7db73eb4c0040ae82881c (patch) | |
| tree | 9246d69cb8c100e52e2b58172f81fc7c87e4e8e6 | |
| parent | fc5155aa204cb07aaa3214876b20b02ad3ddcca1 (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.am | 12 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xhost.man (renamed from xhost.man) | 0 |
4 files changed, 17 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 2c67d26..be6f2c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS = man bin_PROGRAMS = xhost xhost_SOURCES = xhost.c @@ -5,15 +6,7 @@ xhost_SOURCES = xhost.c AM_CFLAGS = $(CWARNFLAGS) $(XHOST_CFLAGS) xhost_LDADD = $(XHOST_LIBS) -appman_PRE = xhost.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 @@ -25,7 +18,4 @@ ChangeLog: dist-hook: ChangeLog INSTALL -SUFFIXES = .$(APP_MAN_SUFFIX) .man -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index 8451ea9..a30c5e2 100644 --- a/configure.ac +++ b/configure.ac @@ -26,4 +26,7 @@ XTRANS_CONNECTION_FLAGS # Secure RPC detection macro from xtrans.m4 XTRANS_SECURE_RPC_FLAGS -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..3e85ee9 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xhost.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/xhost.man b/man/xhost.man index a805edf..a805edf 100644 --- a/xhost.man +++ b/man/xhost.man |