diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:57 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:57 -0500 |
| commit | ee3b33c9e757b8d7f9f4c9761f3c66826adc4f59 (patch) | |
| tree | ef09fd862d0695739509185d7cd83311f6cc4038 | |
| parent | 584ab8bd1cb267510d8966357aaab100fac575be (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 | 18 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xwininfo.man (renamed from xwininfo.man) | 0 |
4 files changed, 18 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 16e47d7..1bb0664 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 = xwininfo AM_CFLAGS = $(CWARNFLAGS) $(XWININFO_CFLAGS) @@ -31,17 +32,8 @@ xwininfo_SOURCES = \ dsimple.h \ xwininfo.c -appman_PRE = \ - xwininfo.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) autogen.sh strnlen.h +EXTRA_DIST = strnlen.h MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -52,9 +44,3 @@ ChangeLog: $(CHANGELOG_CMD) 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 23bd5f9..7f37f14 100644 --- a/configure.ac +++ b/configure.ac @@ -71,4 +71,7 @@ PKG_CHECK_MODULES(XWININFO, [xcb >= 1.6] xcb-shape ${xcb_icccm_pc}) PKG_CHECK_MODULES(XLIB, x11 [xproto >= 7.0.17]) XWININFO_CFLAGS="${XWININFO_CFLAGS} ${XLIB_CFLAGS}" -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..3bf6da8 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xwininfo.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/xwininfo.man b/man/xwininfo.man index 6da7139..6da7139 100644 --- a/xwininfo.man +++ b/man/xwininfo.man |