diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:57 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:57 -0500 |
| commit | ea2109024da4c41d02bec39e131ef7c895ee063c (patch) | |
| tree | a90b24b7e07b75fc81d60f6b42fa8a3029bb9f8c | |
| parent | f659a905e38aa5af4e9ec90b89c11201775a6409 (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/xsetroot.man (renamed from xsetroot.man) | 0 |
4 files changed, 17 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 480c981..9889ad3 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 = xsetroot AM_CFLAGS = $(CWARNFLAGS) $(XSETROOT_CFLAGS) @@ -27,18 +28,7 @@ xsetroot_LDADD = $(XSETROOT_LIBS) xsetroot_SOURCES = \ xsetroot.c -appman_PRE = \ - xsetroot.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 @@ -50,12 +40,6 @@ ChangeLog: dist-hook: ChangeLog INSTALL -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) < $< > $@ - 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 b7ead45..779cb7f 100644 --- a/configure.ac +++ b/configure.ac @@ -41,4 +41,7 @@ PKG_CHECK_MODULES(XSETROOT, xmuu x11 xbitmaps xcursor) 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..68d5fe1 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xsetroot.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/xsetroot.man b/man/xsetroot.man index 26bcfee..26bcfee 100644 --- a/xsetroot.man +++ b/man/xsetroot.man |