r1772 - trunk/packages/xorg-server

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Fri Dec 8 05:09:18 PST 2006


Author: alexander
Date: 2006-12-08 06:09:17 -0700 (Fri, 08 Dec 2006)
New Revision: 1772

Modified:
   trunk/packages/xorg-server/Makefile
Log:
With new autotools, the literal strings ${prefix}/share/X11/xkb and
${prefix}/share/X11/rgb ended up in the /usr/bin/Xorg binary. Work
around this issue by passing the explicit --datadir option.


Modified: trunk/packages/xorg-server/Makefile
===================================================================
--- trunk/packages/xorg-server/Makefile	2006-12-07 15:10:05 UTC (rev 1771)
+++ trunk/packages/xorg-server/Makefile	2006-12-08 13:09:17 UTC (rev 1772)
@@ -36,8 +36,9 @@
 	patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH2)
 	autoreconf --force --install --verbose
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-	    --with-mesa-source=`pwd`/$(DIR1) --with-default-font-path=built-ins
+	./configure --prefix=/usr --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var \
+	    --with-mesa-source=`pwd`/$(DIR1) --with-default-font-path=built-ins \
+	    --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
 	make
 	make install
 




More information about the livecd mailing list