aboutsummaryrefslogtreecommitdiff
path: root/package/tinyx
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2006-07-26 19:11:36 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2006-07-26 19:11:36 +0000
commit5bc8089bcf0fc09af2bda4ee9768ebf8d5941d47 (patch)
treee2dcab143d7e1d71eab07e3f55eb0dee0275175c /package/tinyx
parent15b2f67f645b15dcda3e5e21c2f3068a5daa40be (diff)
downloadbuildroot-5bc8089bcf0fc09af2bda4ee9768ebf8d5941d47.tar.gz
buildroot-5bc8089bcf0fc09af2bda4ee9768ebf8d5941d47.tar.bz2
patch from Biucchi Gabriele:
Some programs (like rxvt) need x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/ , but tinyx.mk does not install anything there. copy everything from $(TINYX_DIR)/exports/ into $(STAGING_DIR)/usr/X11R6/
Diffstat (limited to 'package/tinyx')
-rw-r--r--package/tinyx/tinyx.mk15
1 files changed, 12 insertions, 3 deletions
diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk
index 29972ee530..922bacc1fa 100644
--- a/package/tinyx/tinyx.mk
+++ b/package/tinyx/tinyx.mk
@@ -100,8 +100,17 @@ $(TINYX_XFBDEV): $(TINYX_DIR)/.configure
( cd $(TINYX_DIR) ; $(MAKE) World )
#
-# Once Frame Buffer is built, we install executables.
+# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
+# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin
+$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
+ mkdir -p $(STAGING_DIR)/usr/X11R6/lib
+ mkdir -p $(STAGING_DIR)/usr/X11R6/include
+ cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
+ cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
+ ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
+
#
+# Once Frame Buffer is built, we install executables.
$(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
-mkdir $(TARGET_DIR)/usr/X11R6
-mkdir $(TINYX_BINX)
@@ -116,7 +125,6 @@ $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
#
# After we have executables installed, install the libraries.
-#
$(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
for dirs in $(TINYX_LIBS) ; do \
file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"` ; \
@@ -126,7 +134,8 @@ $(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
cp -pRf $$file $(TINYX_LIBX) ; \
done
-tinyx: zlib $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev
+tinyx: zlib $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2 \
+ $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev
tinyx-source: $(DL_DIR)/$(TINYX_SOURCE)