From 7c55725e4eaf2296d4ea047a155d0ec7bc4976fd Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 9 Aug 2010 16:30:19 -0400 Subject: 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 Signed-off-by: Gaetan Nadon --- Makefile.am | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'Makefile.am') 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) -- cgit v1.2.3