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 | 5a9cffc3f443030ac93d890611316d0994f0cc13 (patch) | |
| tree | a27e67704ba841e0a68820aeaaed4d7702805227 | |
| parent | e72e2768a573bc4d073ce2d56ab4e28678b559b2 (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/xedit.man (renamed from xedit.man) | 0 |
4 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index f02ea7f..fc7a74c 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 = xedit noinst_LIBRARIES = liblisp.a libre.a libmp.a noinst_PROGRAMS = lisp/lsp lisp/re/tests @@ -184,7 +185,6 @@ dist_progmodes_DATA = \ ${srcdir}/lisp/modules/progmodes/xlog.lsp \ ${srcdir}/lisp/modules/progmodes/xrdb.lsp -appman_PRE = xedit.man EXTRA_DIST = \ app-defaults/Xedit-color \ @@ -211,20 +211,7 @@ EXTRA_DIST = \ lisp/test/stream.lsp \ lisp/test/widgets.lsp -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 2a7b6f2..21c6696 100644 --- a/configure.ac +++ b/configure.ac @@ -64,4 +64,7 @@ AC_ARG_WITH(appdefaultdir, AC_SUBST(appdefaultdir) -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..6799ec5 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xedit.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/xedit.man b/man/xedit.man index cd40ad5..cd40ad5 100644 --- a/xedit.man +++ b/man/xedit.man |