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 | e81168403132afe71b38e41cd368d0d9869bd320 (patch) | |
| tree | 40d4c8a4feee8e531d40a05c30d4c9d5dcb7917d | |
| parent | 857e73cfd8d79c8f81712fae8b4fa2d7e8565796 (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 | 21 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xmag.man (renamed from xmag.man) | 0 |
4 files changed, 18 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index b52bebc..2ec463c 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 = xmag AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS) @@ -35,9 +36,6 @@ xmag_SOURCES = \ ScaleP.h \ xmag.c -appman_PRE = \ - xmag.man - # App default files (*.ad) DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -48,24 +46,9 @@ dist_appdefault_DATA = \ app-defaults/Xmag # Developer documentation for Scale widget in Scale.c -EXTRA_DIST = Scale.txt - -EXTRA_DIST += xmag.icon - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +EXTRA_DIST = Scale.txt xmag.icon -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 66b0903..a688487 100644 --- a/configure.ac +++ b/configure.ac @@ -48,4 +48,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..2b87098 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xmag.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) < $< > $@ |