From a9a68fabc57ddc5905c282d2d4c54c3919aa2100 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Tue, 28 Aug 2007 23:02:52 +0000
Subject: [PATCH] Add default X11 install directory

---
 package/Config.in    |  8 ++++++++
 package/Makefile.in  |  3 +++
 package/rxvt/rxvt.mk | 28 ++++++++--------------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index d6f94f91fe..b9614ec273 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -318,6 +318,14 @@ config BR2_PACKAGE_XSERVER_xorg
 config BR2_PACKAGE_XSERVER_tinyx
 	bool "tinyx"
 endchoice
+
+config BR2_X11_PREFIX
+	string
+	default "/usr/X11R6"	if BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx
+	default "/usr"		if !BR2_PACKAGE_XSERVER_xorg && !BR2_PACKAGE_XSERVER_tinyx
+	help
+	  X11 apps root location
+
 if BR2_PACKAGE_XSERVER_x11r7
 source "package/x11r7/Config.in"
 endif
diff --git a/package/Makefile.in b/package/Makefile.in
index bdfa1e2acc..8adce85456 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -241,5 +241,8 @@ ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)
 XSERVER+=xggi
 endif
 
+X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))
+#"))
+
 include package/Makefile.autotools.in
 
diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk
index 09f435b5ef..7cbbe7ad13 100644
--- a/package/rxvt/rxvt.mk
+++ b/package/rxvt/rxvt.mk
@@ -27,18 +27,6 @@ RXVT_CAT:=$(ZCAT)
 RXVT_DIR:=$(BUILD_DIR)/rxvt-$(RXVT_VERSION)
 RXVT_BINARY:=$(RXVT_DIR)/src/rxvt
 
-ifeq ($(strip $(BR2_PACKAGE_XSERVER_xorg)),y)
-RXVT_PREFIX:=/usr/X11R6
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_XSERVER_tinyx)),y)
-RXVT_PREFIX:=/usr/X11R6
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_XSERVER_x11r7)),y)
-RXVT_PREFIX:=/usr
-endif
-
 $(DL_DIR)/$(RXVT_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(RXVT_SITE)/$(RXVT_SOURCE)
 
@@ -58,11 +46,11 @@ $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=$(RXVT_PREFIX) \
+		--prefix=$(X11_PREFIX) \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
-		--x-includes=$(STAGING_DIR)$(RXVT_PREFIX)/include \
-		--x-libraries=$(STAGING_DIR)$(RXVT_PREFIX)/lib \
+		--x-includes=$(STAGING_DIR)$(X11_PREFIX)/include \
+		--x-libraries=$(STAGING_DIR)$(X11_PREFIX)/lib \
 		--disable-resources \
 		--disable-memset \
 	)
@@ -72,14 +60,14 @@ $(RXVT_BINARY): $(RXVT_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(RXVT_DIR)
 	$(STRIP) $(STRIP_DISCARD_ALL) $(RXVT_BINARY)
 
-$(TARGET_DIR)$(RXVT_PREFIX)/bin/rxvt: $(RXVT_BINARY)
-	cp -f $(RXVT_BINARY) $(TARGET_DIR)$(RXVT_PREFIX)/bin
-	(cd $(TARGET_DIR)$(RXVT_PREFIX)/bin; ln -fs rxvt xterm)
+$(TARGET_DIR)$(X11_PREFIX)/bin/rxvt: $(RXVT_BINARY)
+	cp -f $(RXVT_BINARY) $(TARGET_DIR)$(X11_PREFIX)/bin
+	(cd $(TARGET_DIR)$(X11_PREFIX)/bin; ln -fs rxvt xterm)
 
-rxvt: $(XSERVER) $(TARGET_DIR)$(RXVT_PREFIX)/bin/rxvt
+rxvt: $(XSERVER) $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt
 
 rxvt-clean:
-	rm -f $(TARGET_DIR)$(RXVT_PREFIX)/bin/rxvt
+	rm -f $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt
 	-$(MAKE) -C $(RXVT_DIR) clean
 
 rxvt-dirclean:
-- 
2.30.2