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 | e7c5c1018964e5213d1bf727ebfd90e95dbca6a2 (patch) | |
| tree | 5c90362d390c9f3a23f495f707ed4a89b41ccbcb | |
| parent | 95987d19b9802c235f2257eceff663a4a1e286fa (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 | 18 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xkbevd.man (renamed from xkbevd.man) | 0 |
4 files changed, 17 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 949411a..3092353 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xkbevd AM_CFLAGS = $(CWARNFLAGS) $(XKBEVD_CFLAGS) \ @@ -35,9 +36,6 @@ xkbevd_SOURCES = \ xkbevd.c \ xkbevd.h -appman_PRE = \ - xkbevd.man - BUILT_SOURCES = cfgparse.c MAINTAINERCLEANFILES = ChangeLog INSTALL MAINTAINERCLEANFILES += $(BUILT_SOURCES) @@ -45,20 +43,6 @@ MAINTAINERCLEANFILES += $(BUILT_SOURCES) # Sample configuration files EXTRA_DIST = example.cf xkbevd.cf -appmandir = $(APP_MAN_DIR) - -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) < $< > $@ - - .PHONY: ChangeLog INSTALL INSTALL: diff --git a/configure.ac b/configure.ac index 6486278..73bc3c4 100644 --- a/configure.ac +++ b/configure.ac @@ -48,4 +48,7 @@ fi # Checks for pkg-config packages PKG_CHECK_MODULES(XKBEVD, xkbfile 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..b4fe6fb --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xkbevd.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/xkbevd.man b/man/xkbevd.man index 30a05ad..30a05ad 100644 --- a/xkbevd.man +++ b/man/xkbevd.man |