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:06:55 -0500 |
| commit | b9ccbf0de88e95aad25e368500a7eab217f6d434 (patch) | |
| tree | 4d0809df5a6e5d9f0fcfd3b669310ee2753a45d4 | |
| parent | ffd737b4a391415b9d5cae0c6323101f68b1cac0 (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 | 19 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/mkfontdir.man (renamed from mkfontdir.man) | 0 |
4 files changed, 19 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index af62381..b7610ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,30 +19,17 @@ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_SCRIPTS = mkfontdir -appman_PRE = mkfontdir.man - .cpp: $(AM_V_GEN)$(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < $< | $(SED) s/XCOMM/\#/ > $@ EXTRA_DIST = mkfontdir.cpp -MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(bin_SCRIPTS) +SUFFIXES = .cpp -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 49acfd1..3090eab 100644 --- a/configure.ac +++ b/configure.ac @@ -38,4 +38,7 @@ XORG_DEFAULT_OPTIONS AC_SUBST([bindir]) -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..492c64d --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = mkfontdir.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/mkfontdir.man b/man/mkfontdir.man index d00853e..d00853e 100644 --- a/mkfontdir.man +++ b/man/mkfontdir.man |