Commit d26d1d0f authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

This is my attempt to realize a rxvt-version for xorg, tinyx and the new x11r7. 


I tested it with xorg and x11r7. (Don't know if it works with tinyx,
because the tinyx-build fails)


Signed-off-by: default avatarSimon Pasch <fpasch@googlemail.com>
parent d299916b

package/rxvt/Config.in

+1 −3
Original line number Diff line number Diff line 
config BR2_PACKAGE_RXVT

	bool "rxvt"

	default n

	depends BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx



	depends BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx || BR2_PACKAGE_XSERVER_x11r7

	help

	  A nice small colour vt102 X terminal emulator.

	  Does not build for X11R7 yet.



	  http://www.rxvt.org/

package/rxvt/rxvt.mk

+20 −8
Original line number Diff line number Diff line
@@ -27,6 +27,18 @@ 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)
@@ -46,11 +58,11 @@ $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked 
		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr/X11R6 \

		--prefix=$(RXVT_PREFIX) \

		--mandir=/usr/man \

		--infodir=/usr/info \

		--x-includes=$(STAGING_DIR)/usr/X11R6/include \

		--x-libraries=$(STAGING_DIR)/usr/X11R6/lib \

		--x-includes=$(STAGING_DIR)$(RXVT_PREFIX)/include \

		--x-libraries=$(STAGING_DIR)$(RXVT_PREFIX)/lib \

		--disable-resources \

		--disable-memset \

	)
@@ -60,14 +72,14 @@ $(RXVT_BINARY): $(RXVT_DIR)/.configured 
	$(MAKE) CC=$(TARGET_CC) -C $(RXVT_DIR)

	$(STRIP) $(STRIP_DISCARD_ALL) $(RXVT_BINARY)



$(TARGET_DIR)/usr/X11R6/bin/rxvt: $(RXVT_BINARY)

	cp -f $(RXVT_BINARY) $(TARGET_DIR)/usr/X11R6/bin

	(cd $(TARGET_DIR)/usr/X11R6/bin; ln -fs rxvt xterm)

$(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)



rxvt: $(XSERVER) $(TARGET_DIR)/usr/X11R6/bin/rxvt

rxvt: $(XSERVER) $(TARGET_DIR)$(RXVT_PREFIX)/bin/rxvt



rxvt-clean:

	rm -f $(TARGET_DIR)/usr/X11R6/bin/rxvt

	rm -f $(TARGET_DIR)$(RXVT_PREFIX)/bin/rxvt

	-$(MAKE) -C $(RXVT_DIR) clean



rxvt-dirclean: