aboutsummaryrefslogtreecommitdiff
path: root/package/x11r7
diff options
context:
space:
mode:
Diffstat (limited to 'package/x11r7')
-rw-r--r--package/x11r7/mcookie/mcookie.mk2
-rw-r--r--package/x11r7/mesa3d/mesa3d.mk2
-rw-r--r--package/x11r7/xapp_xman/xapp_xman.mk2
-rw-r--r--package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk2
-rw-r--r--package/x11r7/xfont_font-util/xfont_font-util.mk2
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk8
6 files changed, 9 insertions, 9 deletions
diff --git a/package/x11r7/mcookie/mcookie.mk b/package/x11r7/mcookie/mcookie.mk
index 67e2cd84e6..12ef475799 100644
--- a/package/x11r7/mcookie/mcookie.mk
+++ b/package/x11r7/mcookie/mcookie.mk
@@ -15,6 +15,6 @@ mcookie: $(TARGET_DIR)/usr/bin/mcookie
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_MCOOKIE)),y)
+ifeq ($(BR2_PACKAGE_MCOOKIE),y)
TARGETS+=mcookie
endif
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 47de48a9f5..e87af1645b 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -77,7 +77,7 @@ mesa3d-dirclean:
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_MESA3D)),y)
+ifeq ($(BR2_PACKAGE_MESA3D),y)
TARGETS+=mesa3d
endif
# :mode=makefile:
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 4e207fdd99..4921604424 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -78,7 +78,7 @@ xapp_xman: xapp_xman-depends $(XAPP_XMAN_DIR)/.installed
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_XAPP_XMAN)),y)
+ifeq ($(BR2_PACKAGE_XAPP_XMAN),y)
TARGETS+=xapp_xman
endif
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index 588771e98c..111898c711 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -80,7 +80,7 @@ xdata_xcursor-themes: xdata_xcursor-themes-depends $(XDATA_XCURSOR_THEMES_DIR)/.
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_XDATA_XCURSOR_THEMES)),y)
+ifeq ($(BR2_PACKAGE_XDATA_XCURSOR_THEMES),y)
TARGETS+=xdata_xcursor-themes
endif
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index fcf2a1ee5a..99b1061896 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -74,7 +74,7 @@ xfont_font-util-dirclean:
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_XFONT_FONT_UTIL)),y)
+ifeq ($(BR2_PACKAGE_XFONT_FONT_UTIL),y)
TARGETS+=xfont_font-util
endif
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 14fb36134b..27e8609622 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -10,7 +10,7 @@ XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserv
XSERVER_XORG_SERVER_AUTORECONF = NO
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-ifeq ($(strip $(BR2_PACKAGE_XSERVER_xorg)),y)
+ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
XSERVER_XORG_MESA_DEPS:=mesa3d
XSERVER_XORG_MESA_DIR:=--with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)"
XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg
@@ -18,13 +18,13 @@ else
XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg
endif
-ifeq ($(strip $(BR2_PACKAGE_XSERVER_tinyx)),y)
+ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev
else
XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev
endif
-ifeq ($(strip $(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR)),y)
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR),y)
XSERVER_XORG_NULL_CURSOR:=--enable-null-root-cursor
else
XSERVER_XORG_NULL_CURSOR:=--disable-null-root-cursor
@@ -54,7 +54,7 @@ XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) \
XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
# Optional packages
-ifeq ($(strip $(BR2_PACKAGE_TSLIB)),y)
+ifeq ($(BR2_PACKAGE_TSLIB),y)
XSERVER_XORG_SERVER_DEPENDENCIES += tslib
XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts"
endif