[PATCH modular 09/13] build.sh: do not set or document the xserver FONTPATH env variable

Gaetan Nadon memsize at videotron.ca
Wed Dec 29 07:44:27 PST 2010


This variable was introduced in 2005 at a time where the xserver did
not supply a default value for FONTPATH. Now it does, and it is more
complex that this script handle.

If the variable is set in the build environment by the user, it will continue
to be picked-up by the xserver.

If the variable was set by the script, its incorrect value will no longer
be used by the xserver as it provides a correct default value.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 build.sh |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/build.sh b/build.sh
index bab718f..6361952 100755
--- a/build.sh
+++ b/build.sh
@@ -23,8 +23,6 @@ Environment variables specific to build.sh:
               Optional when using --clone to update source code before building
   CONFFLAGS   Configure options to pass to all Autoconf configure scripts
               Refer to 'configure --help' from any module/components
-  FONTPATH    Path to fonts directories [\$LIBDIR/X11/fonts/misc/, ...]
-              Picked-up by the xserver as a value for --with-default-font-path
 
 Environment variables defined by the GNU Build System:
   ACLOCAL     The aclocal cmd name [aclocal -I \${DESTDIR}/\${DATADIR}/aclocal]
@@ -89,12 +87,6 @@ setup_buildenv() {
     # Choose which make program to use
     MAKE=${MAKE:="make"}
 
-    # Set the default font path for xserver/xorg unless it's already set
-    if [ X"$FONTPATH" = X ]; then
-	FONTPATH="${LIBDIR}/X11/fonts/misc/,${LIBDIR}/X11/fonts/Type1/,${LIBDIR}/X11/fonts/75dpi/,${LIBDIR}/X11/fonts/100dpi/,${LIBDIR}/X11/fonts/cyrillic/,${LIBDIR}/X11/fonts/TTF/"
-	export FONTPATH
-    fi
-
     # Create the log file directory
     $SUDO mkdir -p ${DESTDIR}${LOCALSTATEDIR}/log
 }
-- 
1.6.0.4



More information about the xorg-devel mailing list