diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:55 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:55 -0500 |
| commit | 3dd75eb87cc61e9b6acbd18c79357a4ae63cc440 (patch) | |
| tree | 094f33a1349b204666b4d6430a361151a871f3fa | |
| parent | 13c461883dc65eb63a116e3e3131e00076a82095 (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 | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/listres.man (renamed from listres.man) | 0 |
4 files changed, 17 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index a7ff425..6173943 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 = listres AM_CFLAGS = $(CWARNFLAGS) $(LISTRES_CFLAGS) -D_BSD_SOURCE @@ -27,42 +28,7 @@ listres_LDADD = $(LISTRES_LIBS) listres_SOURCES = \ listres.c -appman_PRE = \ - listres.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_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 = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index a2cb490..9e6effe 100644 --- a/configure.ac +++ b/configure.ac @@ -39,4 +39,7 @@ AC_CONFIG_HEADERS([config.h]) # Checks for pkg-config packages PKG_CHECK_MODULES(LISTRES, xaw7 x11 xt xmu) -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..fcd9ad5 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = listres.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/listres.man b/man/listres.man index 77b3e2d..77b3e2d 100644 --- a/listres.man +++ b/man/listres.man |