diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:55 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:15:18 -0500 |
| commit | 623a620bde1988e105b2fe814a3158da0e7b863c (patch) | |
| tree | 52456c31530979880418e6abb84bff0ed1f34c4d | |
| parent | 2e2073e358a6d9069dd5b5f3757de769cbc92721 (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 | 15 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/mkfontscale.man (renamed from mkfontscale.man) | 0 |
4 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 10489ad..e276fec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = mkfontscale AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE @@ -35,21 +36,7 @@ mkfontscale_SOURCES = \ list.h \ mkfontscale.c -appman_PRE = mkfontscale.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 5fd187f..b7f72aa 100644 --- a/configure.ac +++ b/configure.ac @@ -58,4 +58,7 @@ PKG_CHECK_MODULES(X11, xproto) 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..d6074b8 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = mkfontscale.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/mkfontscale.man b/man/mkfontscale.man index 4ed3d7d..4ed3d7d 100644 --- a/mkfontscale.man +++ b/man/mkfontscale.man |