aboutsummaryrefslogtreecommitdiff
path: root/package/rxvt
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-28 23:02:52 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-28 23:02:52 +0000
commita9a68fabc57ddc5905c282d2d4c54c3919aa2100 (patch)
tree9fd09033895caef0cc54fb359a025de2006ec4c3 /package/rxvt
parentff9e81e7fa98b1fa87d93dacf5acc08adb5ded7b (diff)
downloadbuildroot-a9a68fabc57ddc5905c282d2d4c54c3919aa2100.tar.gz
buildroot-a9a68fabc57ddc5905c282d2d4c54c3919aa2100.tar.bz2
Add default X11 install directory
Diffstat (limited to 'package/rxvt')
-rw-r--r--package/rxvt/rxvt.mk28
1 files changed, 8 insertions, 20 deletions
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: