From 7bb70e6f8f394775d5d7ed7035a6d4b2accd2892 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 18 Aug 2010 17:23:31 -0400 Subject: man: remove unrequired local fix for bug 5628 Local fix in CVS for bug 5628 is not required as the problem has been fixed in util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba Signed-off-by: Gaetan Nadon --- man/Makefile.am | 7 +------ man/XvShmCreateImage.man | 2 +- man/XvShmPutImage.man | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index 9d8a9ac..2a8cbb6 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -53,8 +53,6 @@ libman_PRE = \ libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - EXTRA_DIST = $(libman_PRE) xv-library-v2.2.txt CLEANFILES = $(libman_DATA) @@ -62,8 +60,5 @@ CLEANFILES = $(libman_DATA) SUFFIXES = .$(LIB_MAN_SUFFIX) .man # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -ADDITIONAL_MAN_SUBSTS = \ - -e 's|__libmandirsuffix__|$(LIB_MAN_DIR_SUFFIX)|g' - .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) $(ADDITIONAL_MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/XvShmCreateImage.man b/man/XvShmCreateImage.man index f44dd89..a215080 100644 --- a/man/XvShmCreateImage.man +++ b/man/XvShmCreateImage.man @@ -1 +1 @@ -.so man__libmandirsuffix__/XvCreateImage.__libmandirsuffix__ +.so man__libmansuffix__/XvCreateImage.__libmansuffix__ diff --git a/man/XvShmPutImage.man b/man/XvShmPutImage.man index 3f15682..0cf496f 100644 --- a/man/XvShmPutImage.man +++ b/man/XvShmPutImage.man @@ -1 +1 @@ -.so man__libmandirsuffix__/XvPutImage.__libmandirsuffix__ +.so man__libmansuffix__/XvPutImage.__libmansuffix__ -- cgit v1.2.3