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 | 81129a226ae24600642249847cdcc980ec5f9d18 (patch) | |
| tree | 7c8620eb04768187635a506ae88bfa544fb47b73 | |
| parent | 936aa5b9bbbe3a2bf08f928fa5f186d2b75e0a71 (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 | 21 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xclipboard.man (renamed from xclipboard.man) | 0 | ||||
| -rw-r--r-- | man/xcutsel.man (renamed from xcutsel.man) | 0 |
5 files changed, 17 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index c8a12ae..58273bc 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 = xclipboard xcutsel AM_CFLAGS = $(CWARNFLAGS) $(XCLIPBOARD_CFLAGS) @@ -37,12 +38,6 @@ xcutsel_LDADD = $(XCLIPBOARD_LIBS) xcutsel_SOURCES = \ xcutsel.c -# man pages - -appman_PRE = \ - xclipboard.man \ - xcutsel.man - # App default files (*.ad) DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -52,21 +47,7 @@ appdefaultdir = @appdefaultdir@ dist_appdefault_DATA = \ app-defaults/XClipboard - -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 c9f34ad..b289038 100644 --- a/configure.ac +++ b/configure.ac @@ -53,4 +53,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..bbaa367 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xclipboard.man xcutsel.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/xclipboard.man b/man/xclipboard.man index 64474e8..64474e8 100644 --- a/xclipboard.man +++ b/man/xclipboard.man diff --git a/xcutsel.man b/man/xcutsel.man index c122872..c122872 100644 --- a/xcutsel.man +++ b/man/xcutsel.man |