diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-13 15:14:52 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-13 15:14:52 -0500 |
| commit | 379b0529eca8cc808c31e21afe041e36ffe82469 (patch) | |
| tree | 02c2f624146a81abd93a0a3a8342f6207f1c1ac1 | |
| parent | a298bf274a53c1c04b6b634b7e5bfb1f6ff62089 (diff) | |
| download | xscope-379b0529eca8cc808c31e21afe041e36ffe82469.tar.gz | |
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 | 16 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xscope.man (renamed from xscope.man) | 0 |
4 files changed, 17 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 293527f..8a61eaf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,7 @@ # # +SUBDIRS = man bin_PROGRAMS = xscope AM_CFLAGS = $(CWARNFLAGS) $(XSCOPE_CFLAGS) @@ -69,16 +70,7 @@ xscope_SOURCES = \ wcpscope.h \ x11.h -appman_PRE = \ - xscope.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) autogen.sh MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -90,12 +82,6 @@ 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) < $< > $@ - if LINT # Check source code with tools like lint & sparse diff --git a/configure.ac b/configure.ac index ca8fdd7..fd444f9 100644 --- a/configure.ac +++ b/configure.ac @@ -73,4 +73,7 @@ AC_CHECK_HEADERS([sys/filio.h]) dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT -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..ed23ba2 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xscope.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/xscope.man b/man/xscope.man index f6ae899..f6ae899 100644 --- a/xscope.man +++ b/man/xscope.man |