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
commit8bafda7027f51313cfd8e5f4447812064c1686bb (patch)
treeb65cf0ba51930b3e12eafc127b44b51efa883cc4
parentb2b7d64bf81dc9dc425c1ae16428b654cb4ee582 (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.am11
-rw-r--r--configure.ac5
-rw-r--r--man/Makefile.am12
-rw-r--r--man/fslsfonts.man (renamed from fslsfonts.man)0
4 files changed, 17 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 60f3203..1341f5a 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 = fslsfonts
AM_CFLAGS = $(FSLSFONTS_CFLAGS) $(CWARNFLAGS)
@@ -27,23 +28,13 @@ fslsfonts_LDADD = $(FSLSFONTS_LIBS)
fslsfonts_SOURCES = \
fslsfonts.c
-appman_PRE = \
- fslsfonts.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 f247a58..63e0665 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,4 +38,7 @@ AC_CONFIG_HEADERS([config.h])
# Checks for pkg-config packages
PKG_CHECK_MODULES(FSLSFONTS, xproto 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..e9caaac
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = fslsfonts.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/fslsfonts.man b/man/fslsfonts.man
index 35dd1c3..35dd1c3 100644
--- a/fslsfonts.man
+++ b/man/fslsfonts.man