summaryrefslogtreecommitdiffstats
path: root/xorg-util
diff options
context:
space:
mode:
authorThomas Orgis2007-12-04 22:24:58 +0100
committerThomas Orgis2007-12-04 22:24:58 +0100
commitdf328c3b30d5c4129a50a93dd36764deb7f30234 (patch)
tree156760c0059684cc98a826b35ec58695f6b58724 /xorg-util
parentf4358b790d04a8a959c14f1787217d24e89cdad7 (diff)
xorg-cf-files: fix config for x86-64; no lib64! (made other spells install to /usr/lib64, even when xorg didn't do that)
Diffstat (limited to 'xorg-util')
-rw-r--r--xorg-util/xorg-cf-files/HISTORY5
-rwxr-xr-xxorg-util/xorg-cf-files/PRE_BUILD1
-rw-r--r--xorg-util/xorg-cf-files/lib64.patch11
3 files changed, 17 insertions, 0 deletions
diff --git a/xorg-util/xorg-cf-files/HISTORY b/xorg-util/xorg-cf-files/HISTORY
index 6a2e4d8a28..3724c2f481 100644
--- a/xorg-util/xorg-cf-files/HISTORY
+++ b/xorg-util/xorg-cf-files/HISTORY
@@ -1,3 +1,8 @@
+2007-12-04 Thomas Orgis <sobukus@sourcemage.org>
+ * PRE_BUILD, lib64.patch: X11 libdir is _not_ /usr/lib64.
+ this config file issue made some apps (groff at least) install
+ stuff to /usr/lib64
+
2007-08-03 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: update description & short (automated)
diff --git a/xorg-util/xorg-cf-files/PRE_BUILD b/xorg-util/xorg-cf-files/PRE_BUILD
index 4ab933df00..75fb56a474 100755
--- a/xorg-util/xorg-cf-files/PRE_BUILD
+++ b/xorg-util/xorg-cf-files/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -Np0 < "$SCRIPT_DIRECTORY/lib64.patch" &&
sedit "s:/X11R6::" $SOURCE_DIRECTORY/site.def
diff --git a/xorg-util/xorg-cf-files/lib64.patch b/xorg-util/xorg-cf-files/lib64.patch
new file mode 100644
index 0000000000..e53460d3ae
--- /dev/null
+++ b/xorg-util/xorg-cf-files/lib64.patch
@@ -0,0 +1,11 @@
+--- site.def.in.orig 2007-12-04 22:04:33.000000000 +0100
++++ site.def.in 2007-12-04 22:03:51.000000000 +0100
+@@ -33,7 +33,7 @@
+
+
+ #ifdef BeforeVendorCF
+-
++#define HaveLib64 NO
+ /*
+ * Include this for easy XFree86 customisations
+ */