diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-08-09 16:30:19 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-08-11 08:03:02 -0400 |
| commit | 7c55725e4eaf2296d4ea047a155d0ec7bc4976fd (patch) | |
| tree | 3b0ace5dfdf3dcbbd64b9c630da5580d573bf943 | |
| parent | 85b1eda6ac104850add5a98fc4caca7f59d7cb19 (diff) | |
config: simplify building of shadow man pages
Store the shadow files in git as any other man page.
Move man pages to man dir and use the common makefile
Local fix for bug 5628 in commit
d8f719a352cd4d4ace60566b73a077175940a351
is not required as the problem has been fixed in
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 31 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | man/Makefile.am | 38 | ||||
| -rw-r--r-- | man/atobm.man | 1 | ||||
| -rw-r--r-- | man/bitmap.man (renamed from bitmap.man) | 0 | ||||
| -rw-r--r-- | man/bmtoa.man | 1 |
6 files changed, 43 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index 8b7dc93..9afde64 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 = bitmap bmtoa atobm # bitmap @@ -53,12 +54,6 @@ atobm_LDADD = $(ATOBM_LDADD) atobm_SOURCES = \ atobm.c -# mans - -appman_PRE = \ - bitmap.man - - # App default files (*.ad) DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -102,29 +97,5 @@ dist_bitmap_DATA = \ Term \ Up -APP_MAN_DIR_SUFFIX = $(APP_MAN_DIR:@mandir@/man%=%) - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) \ - $(man_shadows:=.@APP_MAN_SUFFIX@) - -BUILT_SOURCES = shadows.DONE - -EXTRA_DIST += $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) $(BUILT_SOURCES) - -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) < $< > $@ - -man_shadows = atobm bmtoa -shadows.DONE: - -rm -f $(man_shadows:=.@APP_MAN_SUFFIX@) - (for i in $(man_shadows:=.@APP_MAN_SUFFIX@) ; do \ - echo .so man$(APP_MAN_DIR_SUFFIX)/bitmap.$(APP_MAN_SUFFIX) > $$i; \ - done) diff --git a/configure.ac b/configure.ac index d60e416..b7083e1 100644 --- a/configure.ac +++ b/configure.ac @@ -54,4 +54,5 @@ AC_ARG_WITH(appdefaultdir, [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) -AC_OUTPUT([Makefile]) +AC_OUTPUT([Makefile + man/Makefile]) diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..5bfcf11 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,38 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +appmandir = $(APP_MAN_DIR) + +appman_PRE = bitmap.man atobm.man bmtoa.man + +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) + +CLEANFILES = $(appman_DATA) + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/atobm.man b/man/atobm.man new file mode 100644 index 0000000..9e01467 --- /dev/null +++ b/man/atobm.man @@ -0,0 +1 @@ +.so man__appmansuffix__/bitmap.__appmansuffix__ diff --git a/bitmap.man b/man/bitmap.man index 14a248e..14a248e 100644 --- a/bitmap.man +++ b/man/bitmap.man diff --git a/man/bmtoa.man b/man/bmtoa.man new file mode 100644 index 0000000..9e01467 --- /dev/null +++ b/man/bmtoa.man @@ -0,0 +1 @@ +.so man__appmansuffix__/bitmap.__appmansuffix__ |