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 | ecbd7c66a53cab3964c30158973fc5d620d898cd (patch) | |
tree | fd1eadecceaebb92a2f82b29a23c0a4a5e1a3800 | |
parent | 96196e8c028f2ae72a9322a3b348326df10b8725 (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 | 17 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | man/Makefile.am | 12 | ||||
-rw-r--r-- | man/xeyes.man (renamed from xeyes.man) | 0 |
4 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 8dbfcf1..19e4040 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 = xeyes AM_CFLAGS = $(XEYES_CFLAGS) $(XRENDER_CFLAGS) $(CWARNFLAGS) @@ -32,25 +33,9 @@ xeyes_SOURCES = \ transform.h \ xeyes.c -appman_PRE = \ - xeyes.man - EXTRA_DIST = eyes.bit eyesmask.bit -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 74f5d05..1383c97 100644 --- a/configure.ac +++ b/configure.ac @@ -48,4 +48,7 @@ if test x$use_xrender != xno ; then AC_DEFINE([XRENDER],1,[Define to use X Render Extension]) fi -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..374d22f --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xeyes.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/xeyes.man b/man/xeyes.man index db144b9..db144b9 100644 --- a/xeyes.man +++ b/man/xeyes.man |