diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:55 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-20 08:03:13 -0500 |
| commit | 60cd11cf0b83176e7c542e51a7e6a3eaea58401c (patch) | |
| tree | c409ddcd75a5132a523566d198332ec2a89f8de3 | |
| parent | 7bacea73e67e6882cef51840bb98d1bafb8f2291 (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 | 20 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 14 | ||||
| -rw-r--r-- | man/setxkbmap.man (renamed from setxkbmap.man) | 0 |
4 files changed, 19 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index a292290..08ffbb1 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 = setxkbmap XKBCONFIGROOT=@XKBCONFIGROOT@ @@ -30,16 +31,7 @@ setxkbmap_LDADD = $(SETXKBMAP_LIBS) setxkbmap_SOURCES = \ setxkbmap.c -appman_PRE = \ - setxkbmap.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -51,16 +43,6 @@ ChangeLog: dist-hook: ChangeLog INSTALL -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -setxkbmap_MAN_SUBSTS = \ - -e 's|__xkbconfigroot__|"$(XKBCONFIGROOT)"|' \ - $(MAN_SUBSTS) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(setxkbmap_MAN_SUBSTS) < $< > $@ - if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) diff --git a/configure.ac b/configure.ac index d74db03..bc16554 100644 --- a/configure.ac +++ b/configure.ac @@ -51,4 +51,7 @@ PKG_CHECK_MODULES(SETXKBMAP, xkbfile x11) # 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..2d33de6 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,14 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = setxkbmap.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_SUBSTS += -e 's|__xkbconfigroot__|"$(XKBCONFIGROOT)"|' + +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/setxkbmap.man b/man/setxkbmap.man index 1c0b87a..1c0b87a 100644 --- a/setxkbmap.man +++ b/man/setxkbmap.man |