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
commite2ffb441371eb759c512f8266ae40680518726da (patch)
treef2b0fe73183230094e86b69b40c7313d0d23ff8c
parent3472d917add052f35c1c855a5d488ccdadf22122 (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/smproxy.man (renamed from smproxy.man)0
4 files changed, 17 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index bf47b0c..8beafc6 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 = smproxy
AM_CFLAGS = $(CWARNFLAGS) $(SMPROXY_CFLAGS)
@@ -29,24 +30,7 @@ smproxy_SOURCES = \
smproxy.c \
smproxy.h
-appman_PRE = \
- smproxy.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 b011d3a..0daa9f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,4 +40,7 @@ AC_CHECK_FUNCS([mkstemp])
# Checks for pkg-config packages
PKG_CHECK_MODULES(SMPROXY, sm xt xmuu)
-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..7a853e1
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = smproxy.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/smproxy.man b/man/smproxy.man
index 892dbf2..892dbf2 100644
--- a/smproxy.man
+++ b/man/smproxy.man