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 | 19bcefb4c89e02833cb7fcffeb7fd3f7224db1c4 (patch) | |
| tree | 51733945fc6d9304717246ffdd470c161c9a6779 | |
| parent | f68420e9698d9a3b3e18cbefb96a3ccf9d555c65 (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/xfontsel.man (renamed from xfontsel.man) | 0 |
4 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index c030c97..38d198a 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 = xfontsel AM_CFLAGS = $(XFONTSEL_CFLAGS) $(CWARNFLAGS) @@ -30,9 +31,6 @@ xfontsel_SOURCES = \ ULabelP.h \ xfontsel.c -appman_PRE = \ - xfontsel.man - # App default files DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -41,20 +39,7 @@ appdefaultdir = @appdefaultdir@ dist_appdefault_DATA = \ app-defaults/XFontSel -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 9011333..fe5dd08 100644 --- a/configure.ac +++ b/configure.ac @@ -46,4 +46,7 @@ AC_ARG_WITH(appdefaultdir, AC_SUBST(appdefaultdir) -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..168dbe0 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xfontsel.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/xfontsel.man b/man/xfontsel.man index 00c108d..00c108d 100644 --- a/xfontsel.man +++ b/man/xfontsel.man |