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 | 01ee88f0c5e66bde5fed99c520e3bdc679740b96 (patch) | |
| tree | bae4aab41cb7cd9e106e06077e1058a0468c7ade | |
| parent | 3e4ab9da78e921bcad36ca2e96cffaafa0866472 (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 | 16 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xkbbell.man (renamed from xkbbell.man) | 0 | ||||
| -rw-r--r-- | man/xkbvleds.man (renamed from xkbvleds.man) | 0 | ||||
| -rw-r--r-- | man/xkbwatch.man (renamed from xkbwatch.man) | 0 |
6 files changed, 17 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 44eeb87..a6e69da 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 = xkbvleds xkbwatch xkbbell AM_CFLAGS = $(CWARNFLAGS) @@ -43,22 +44,7 @@ xkbwatch_SOURCES = xkbwatch.c LED.c LED.h LEDP.h utils.c utils.h xkbwatch_CFLAGS = $(XKBWATCH_CFLAGS) $(AM_CFLAGS) xkbwatch_LDADD = $(XKBWATCH_LIBS) -# Man pages -appman_PRE = xkbbell.man xkbvleds.man xkbwatch.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 6e4329a..9a1badd 100644 --- a/configure.ac +++ b/configure.ac @@ -46,4 +46,7 @@ PKG_CHECK_MODULES(XKBBELL, xproto inputproto x11) # xkbwatch checks PKG_CHECK_MODULES(XKBWATCH, xproto xaw7 xt x11) -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..4b92e08 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xkbbell.man xkbvleds.man xkbwatch.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/xkbbell.man b/man/xkbbell.man index f248202..f248202 100644 --- a/xkbbell.man +++ b/man/xkbbell.man diff --git a/xkbvleds.man b/man/xkbvleds.man index e6827a5..e6827a5 100644 --- a/xkbvleds.man +++ b/man/xkbvleds.man diff --git a/xkbwatch.man b/man/xkbwatch.man index ec999a5..ec999a5 100644 --- a/xkbwatch.man +++ b/man/xkbwatch.man |