Remove unused X11_PREFIX option

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 2895d8a94181a6a063d331b66594f427459dd2e5..40c6d1820fff68fc62cb5117821b91e33a3542df 100644 (file)
--- 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 80f194a56be870171ece2ca4dce084e77f88f1b8..ca261ee4204f46bdba76c9c54cbf6a8cc50888e2 100644 (file)
--- 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 fc53a1b1e932748dc25c7248de643379e7bfc429..36f2f24191197a5c62c255c36637f30933d2c120 100644 (file)
--- 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 b93cc90dd4a21ba25e4209acde6504e1ee68c86c..c0c0043ba34cd05efc54a5fb0983d478768cb1fe 100644 (file)
--- 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