Attachment 3937 Details for Bug 5175 – update patch so configure displays default mapdir path

[patch] update patch so configure displays default mapdir path

font-util-configure-mapdir.patch (text/plain), 1.14 KB, created by David Coulthart on 2005-11-30 03:45:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Coulthart

Created: 2005-11-30 03:45:46 UTC

Size: 1.14 KB

patch

obsolete

>Index: Makefile.am
>===================================================================
>RCS file: /cvs/xorg/font/util/Makefile.am,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile.am
>--- Makefile.am	15 Nov 2005 08:27:53 -0000	1.7
>+++ Makefile.am	26 Nov 2005 21:23:49 -0000
>@@ -31,7 +31,7 @@
> aclocaldir = $(datadir)/aclocal
> aclocal_DATA = fontutil.m4
> 
>-mapfilesdir = @mapdir@
>+mapfilesdir = @MAPDIR@
> mapfiles_DATA = \
> 	map-ISO8859-1 \
> 	map-ISO8859-2 \
>Index: configure.ac
>===================================================================
>RCS file: /cvs/xorg/font/util/configure.ac,v
>retrieving revision 1.6
>diff -u -r1.6 configure.ac
>--- configure.ac	19 Oct 2005 02:48:08 -0000	1.6
>+++ configure.ac	26 Nov 2005 21:23:49 -0000
>@@ -31,8 +31,12 @@
> AC_PROG_CC
> AC_PROG_INSTALL
> 
>-mapdir="$libdir/X11/fonts/util"
>-AC_SUBST(mapdir)
>+DEFAULT_MAPDIR=${libdir}/X11/fonts/util
>+AC_ARG_WITH(mapdir,
>+                AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps [[LIBDIR/X11/fonts/util]]]),
>+                    [MAPDIR="$withval"],
>+                        [MAPDIR="$DEFAULT_MAPDIR"])
>+AC_SUBST(MAPDIR)
> 
> XORG_MANPAGE_SECTIONS
> XORG_RELEASE_VERSION

Actions: View | Splinter Review

Attachments on bug 5175: 3914 | 3937 | 3955 | 3956 | 3957 | 3972 | 4051

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.