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 | 512e7a8e82c42add636fbf13d13df854290a35f7 (patch) | |
| tree | ba13d2023a25348ab9bec134a48113c672204dbb | |
| parent | 667b2259b41152f4146b28677d464b7d47ef6bac (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/xcursorgen.man (renamed from xcursorgen.man) | 0 |
4 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 75e7a33..aeb9467 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS = man bin_PROGRAMS = xcursorgen xcursorgen_SOURCES = xcursorgen.c @@ -6,14 +7,7 @@ AM_CFLAGS = $(CWARNFLAGS) $(XCURSORGEN_CFLAGS) xcursorgen_LDADD = $(XCURSORGEN_LIBS) -appmandir = $(APP_MAN_DIR) - -appman_PRE = xcursorgen.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) autogen.sh MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -24,10 +18,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index e797bfd..7229feb 100644 --- a/configure.ac +++ b/configure.ac @@ -20,4 +20,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng >= 1.2.0) -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..f63fb35 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xcursorgen.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/xcursorgen.man b/man/xcursorgen.man index df41d14..df41d14 100644 --- a/xcursorgen.man +++ b/man/xcursorgen.man |