summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-01-19 10:06:55 -0500
committerGaetan Nadon <memsize@videotron.ca>2011-01-19 10:06:55 -0500
commit6ade8927be5a225e5a74e15f9212d11d1e6a576e (patch)
treedbda37410e189cce322a374cbf6b77fd0f3623e6
parentcf9f33527f9accbe2eba269513aa25fbf0df6fb3 (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/fstobdf.man (renamed from fstobdf.man)0
4 files changed, 17 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index ab0eb99..882f0a0 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 = fstobdf
AM_CFLAGS = $(FSTOBDF_CFLAGS) $(CWARNFLAGS)
@@ -31,24 +32,7 @@ fstobdf_SOURCES = \
header.c \
props.c
-appman_PRE = \
- fstobdf.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 9548a25..54a6ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,4 +38,7 @@ AC_CONFIG_HEADERS([config.h])
# Checks for pkg-config packages
PKG_CHECK_MODULES(FSTOBDF, x11 libfs)
-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..93cb448
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = fstobdf.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/fstobdf.man b/man/fstobdf.man
index 9c1c0eb..9c1c0eb 100644
--- a/fstobdf.man
+++ b/man/fstobdf.man