From 4bbeb74b2ed064a99fe74b486241a32d1e53b6a1 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sun, 4 Feb 2007 19:47:41 +0000 Subject: - the $(XSERVER) target can be provided by different X server impls. Adjust users - rdesktop needs an xserver impl --- package/xorg/xorg.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/xorg/xorg.mk') diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index b0c4bc94f..6dc3b0461 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -44,9 +44,9 @@ DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/deja DEJAVU_DIR:=$(BUILD_DIR)/dejavu-ttf-$(DEJAVU_VERSION) # Install Xorg xserver -XSERVER:=Xorg -XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER) -TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER) +XSERVER_BINARY:=Xorg +XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER_BINARY) +TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER_BINARY) # figure out Xorg's idea of corresponding architecture name ifeq ($(BR2_alpha),y) @@ -127,7 +127,7 @@ $(TARGET_XSERVER): $(XORG_XSERVER) $(STRIP) $(XORG_PROGS)/$$file || /bin/true ; \ done cp $(XORG_XSERVER) $(TARGET_XSERVER) - (cd $(XORG_BINX); ln -snf $(XSERVER) X) + (cd $(XORG_BINX); ln -snf $(XSERVER_BINARY) X) $(STRIP) $(TARGET_XSERVER) mkdir -p $(XORG_LIBX)/modules cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/ -- cgit v1.2.3