Attachment 4051 Details for Bug 5175 – configurable-mapdir.patch

[patch] configurable-mapdir.patch

configurable-mapdir.patch (text/plain), 1.65 KB, created by Donnie Berkholz on 2005-12-09 09:55:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Donnie Berkholz

Created: 2005-12-09 09:55:32 UTC

Size: 1.65 KB

patch

obsolete

>Independently created by me, but exactly the same as
>https://bugs.freedesktop.org/show_bug.cgi?id=5175#c4
>
>Donnie Berkholz <spyderous@gentoo.org>
>
>Index: Makefile.am
>===================================================================
>RCS file: /cvs/xorg/font/util/Makefile.am,v
>retrieving revision 1.9
>diff -u -b -B -r1.9 Makefile.am
>--- Makefile.am	6 Dec 2005 22:48:41 -0000	1.9
>+++ Makefile.am	8 Dec 2005 22:54: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.7
>diff -u -b -B -r1.7 configure.ac
>--- configure.ac	3 Dec 2005 05:49:41 -0000	1.7
>+++ configure.ac	8 Dec 2005 22:54: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]),
>+	[MAPDIR="$withval"],
>+	[MAPDIR="$DEFAULT_MAPDIR"])
>+AC_SUBST(MAPDIR)
> 
> XORG_MANPAGE_SECTIONS
> XORG_RELEASE_VERSION
>Index: fontutil.pc.in
>===================================================================
>RCS file: /cvs/xorg/font/util/fontutil.pc.in,v
>retrieving revision 1.1
>diff -u -b -B -r1.1 fontutil.pc.in
>--- fontutil.pc.in	22 Jul 2005 04:13:44 -0000	1.1
>+++ fontutil.pc.in	8 Dec 2005 22:54:49 -0000
>@@ -1,7 +1,7 @@
> prefix=@prefix@
> exec_prefix=@exec_prefix@
> libdir=@libdir@
>-mapdir=@mapdir@
>+mapdir=@MAPDIR@
>  
> Name: FontUtil
> Description: Font utilities dirs

Flags:

kem: 6.9/7.0+

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.