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 | d58d70f6781308de2f905b71a0bfcea1506b0008 (patch) | |
| tree | 7d1a085e1c9641dfccc066ceb49c4dee2568ab17 | |
| parent | 3b18de7f030b89bcbaa54686490c406f73f824d0 (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 | 19 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xrandr.man (renamed from xrandr.man) | 0 |
4 files changed, 18 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 5e60667..4f1c5e7 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 = xrandr bin_SCRIPTS = xkeystone @@ -36,23 +37,8 @@ xrandr_LDADD = $(XRANDR_LIBS) xrandr_SOURCES = \ xrandr.c -appman_PRE = \ - xrandr.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) xrandr_test.pl keystone.5c +EXTRA_DIST = xrandr_test.pl keystone.5c 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 @@ -63,4 +49,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - diff --git a/configure.ac b/configure.ac index 3a4c37c..e4359a2 100644 --- a/configure.ac +++ b/configure.ac @@ -39,4 +39,7 @@ AC_CHECK_LIB(m,floor) # Checks for pkg-config packages PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3 xrender x11) -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..0dcc79d --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xrandr.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/xrandr.man b/man/xrandr.man index ba36ae3..ba36ae3 100644 --- a/xrandr.man +++ b/man/xrandr.man |