summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-01-19 10:06:57 -0500
committerGaetan Nadon <memsize@videotron.ca>2011-01-19 10:06:57 -0500
commit18f7dcdd9fb30b784b3d99cb91d9f5c80cc19f44 (patch)
tree45c7c7e2905f9b6696cd919af22dbfe7e6fb06b2
parentd604128cf39507dc80a46449a15050f2a066d50f (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.am18
-rw-r--r--configure.ac5
-rw-r--r--man/Makefile.am12
-rw-r--r--man/xrefresh.man (renamed from xrefresh.man)0
4 files changed, 17 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index 536da40..ce95ce3 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 = xrefresh
AM_CFLAGS = $(CWARNFLAGS) $(XREFRESH_CFLAGS)
@@ -27,24 +28,7 @@ xrefresh_LDADD = $(XREFRESH_LIBS)
xrefresh_SOURCES = \
xrefresh.c
-appman_PRE = \
- xrefresh.man
-
-
-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 ddddc23..fa6531a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,4 +41,7 @@ XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XREFRESH, 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..8270908
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xrefresh.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/xrefresh.man b/man/xrefresh.man
index 6da5515..6da5515 100644
--- a/xrefresh.man
+++ b/man/xrefresh.man