initial import
This commit is contained in:
88
xenocara-font-alias/fontrootdir-workaround.patch
Normal file
88
xenocara-font-alias/fontrootdir-workaround.patch
Normal file
@@ -0,0 +1,88 @@
|
||||
diff --git a/100dpi/Makefile.in b/100dpi/Makefile.in
|
||||
index 0071db4..d5925ff 100644
|
||||
--- a/100dpi/Makefile.in
|
||||
+++ b/100dpi/Makefile.in
|
||||
@@ -200,6 +200,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
+FONTROOTDIR = @FONTROOTDIR@
|
||||
GREP = @GREP@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
diff --git a/75dpi/Makefile.in b/75dpi/Makefile.in
|
||||
index 0cc3b3b..e7b35b9 100644
|
||||
--- a/75dpi/Makefile.in
|
||||
+++ b/75dpi/Makefile.in
|
||||
@@ -200,6 +200,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
+FONTROOTDIR = @FONTROOTDIR@
|
||||
GREP = @GREP@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 9a567bb..b6add79 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -251,6 +251,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
+FONTROOTDIR = @FONTROOTDIR@
|
||||
GREP = @GREP@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c3567ff..58ad8a5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -36,7 +36,22 @@ XORG_DEFAULT_OPTIONS
|
||||
|
||||
AC_PROG_INSTALL
|
||||
|
||||
-XORG_FONTROOTDIR
|
||||
+
|
||||
+# Sets FONTROOTDIR to the root directory for font files. Uses the first
|
||||
+# found from:
|
||||
+# --with-fontrootdir
|
||||
+# ${datadir}/fonts/X11
|
||||
+AC_MSG_CHECKING([for root directory for font files])
|
||||
+AC_ARG_WITH(fontrootdir,
|
||||
+ AS_HELP_STRING([--with-fontrootdir=DIR],
|
||||
+ [Path to root directory for font files]),
|
||||
+ [FONTROOTDIR="$withval"])
|
||||
+# if --with-fontrootdir not specified...
|
||||
+if test "x${FONTROOTDIR}" = "x"; then
|
||||
+ FONTROOTDIR="${datadir}/fonts/X11"
|
||||
+fi
|
||||
+AC_SUBST(FONTROOTDIR)
|
||||
+AC_MSG_RESULT([${FONTROOTDIR}])
|
||||
|
||||
AC_ARG_WITH(top-fontdir, AC_HELP_STRING([--with-top-fontdir=<pathname>],
|
||||
[Obsolete: use --with-fontrootdir instead]),
|
||||
diff --git a/cyrillic/Makefile.in b/cyrillic/Makefile.in
|
||||
index 4320ec9..52037d5 100644
|
||||
--- a/cyrillic/Makefile.in
|
||||
+++ b/cyrillic/Makefile.in
|
||||
@@ -200,6 +200,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
+FONTROOTDIR = @FONTROOTDIR@
|
||||
GREP = @GREP@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
diff --git a/misc/Makefile.in b/misc/Makefile.in
|
||||
index 0474258..e738c51 100644
|
||||
--- a/misc/Makefile.in
|
||||
+++ b/misc/Makefile.in
|
||||
@@ -200,6 +200,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
+FONTROOTDIR = @FONTROOTDIR@
|
||||
GREP = @GREP@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
Reference in New Issue
Block a user