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 | 2e7b697e9b5719056430cead8f4f155db141629a (patch) | |
tree | 834bf42dcb7d2e7cc18b59f6bae9aceb66da5b60 | |
parent | 5f862ac7239618dcccd793aa8a13490f3f67ff50 (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 | 17 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | man/Makefile.am | 12 | ||||
-rw-r--r-- | man/xev.man (renamed from xev.man) | 0 |
4 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 26ba697..2b1677b 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 = xev AM_CFLAGS = $(CWARNFLAGS) $(XEV_CFLAGS) @@ -27,23 +28,7 @@ xev_LDADD = $(XEV_LIBS) xev_SOURCES = \ xev.c -appman_PRE = \ - xev.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -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) < $< > $@ .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 4019c34..bc31f6c 100644 --- a/configure.ac +++ b/configure.ac @@ -38,4 +38,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XEV, 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..f8a4404 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xev.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) < $< > $@ |