diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-13 08:39:06 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-13 08:39:06 -0500 |
| commit | ea8ff770d809eae850c5dd5bd08789b202ca8aa0 (patch) | |
| tree | 3ea4f803f82900910fdb187f12abe98bfeb08356 | |
| parent | 7f82c864a830af61360231c8fcb301f1793d4598 (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 | 36 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | man/mkcomposecache.man (renamed from mkcomposecache.man) | 0 |
3 files changed, 8 insertions, 35 deletions
diff --git a/Makefile.am b/Makefile.am index a12139c..14ff0d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,12 @@ -AM_CFLAGS = @XLIB_CFLAGS@ $(CWARNFLAGS) - +SUBDIRS = man sbin_PROGRAMS = mkcomposecache -adminmandir = $(ADMIN_MAN_DIR) -adminman_PRE = mkcomposecache.man -adminman_DATA = $(adminman_PRE:man=@ADMIN_MAN_SUFFIX@) - -EXTRA_DIST = mkallcomposecaches.sh $(adminman_PRE) - +AM_CFLAGS = $(XLIB_CFLAGS) $(CWARNFLAGS) mkcomposecache_SOURCES = mkcomposecache.c +mkcomposecache_LDADD = $(XLIB_LIBS) -mkcomposecache_LDADD = @XLIB_LIBS@ - +EXTRA_DIST = mkallcomposecaches.sh MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(adminman_DATA) .PHONY: ChangeLog INSTALL @@ -24,24 +17,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(ADMIN_MAN_SUFFIX) .man - -.man.$(ADMIN_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index 7855816..727f100 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,6 @@ AM_MAINTAINER_MODE m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS PKG_CHECK_MODULES(XLIB, x11) @@ -21,5 +20,7 @@ AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h locale.h], , [AC_MSG_FAILUR AC_CHECK_FUNCS([setlocale], , [AC_MSG_FAILURE("cannot find essential function")]) AC_CHECK_FUNCS([unsetenv]) - -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff --git a/mkcomposecache.man b/man/mkcomposecache.man index e774fff..e774fff 100644 --- a/mkcomposecache.man +++ b/man/mkcomposecache.man |