From ef2c11e51a08383c4a3bbd370e12e1db4875a447 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 27 Jul 2010 23:46:27 +0200 Subject: Remove unused X11_PREFIX option Signed-off-by: Thomas Petazzoni --- configs/kb9202_defconfig | 1 - configs/v100sc2_defconfig | 1 - package/Makefile.in | 4 ---- package/x11r7/Config.in | 7 ------- 4 files changed, 13 deletions(-) diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig index 2895d8a94..40c6d1820 100644 --- a/configs/kb9202_defconfig +++ b/configs/kb9202_defconfig @@ -551,7 +551,6 @@ BR2_PACKAGE_XSERVER_none=y # BR2_PACKAGE_XSERVER_x11r7 is not set # BR2_PACKAGE_XSERVER_xorg is not set # BR2_PACKAGE_XSERVER_tinyx is not set -BR2_X11_PREFIX="/usr" # # X libraries and helper libraries diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig index 80f194a56..ca261ee42 100644 --- a/configs/v100sc2_defconfig +++ b/configs/v100sc2_defconfig @@ -568,7 +568,6 @@ BR2_PACKAGE_QT_OPENSSL=y # BR2_PACKAGE_XSERVER_none is not set # BR2_PACKAGE_XSERVER_xorg is not set # BR2_PACKAGE_XSERVER_tinyx is not set -BR2_X11_PREFIX="/usr" # BR2_PACKAGE_XORG7 is not set # diff --git a/package/Makefile.in b/package/Makefile.in index fc53a1b1e..36f2f2419 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -292,9 +292,5 @@ else ENABLE_DEBUG:= endif -# X Windowing system - -X11_PREFIX:=$(call qstrip,$(BR2_X11_PREFIX)) - include package/Makefile.autotools.in include package/Makefile.package.in diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index b93cc90dd..c0c0043ba 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -29,13 +29,6 @@ config BR2_PACKAGE_XSERVER_tinyx endchoice -config BR2_X11_PREFIX - string - default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg - default "/usr" if BR2_PACKAGE_XSERVER_tinyx - help - X11 apps root location - menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in endmenu -- cgit v1.2.3