summaryrefslogtreecommitdiff
path: root/package/xorg/xorg.mk
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2007-01-11 06:17:04 +0000
committerEric Andersen <andersen@codepoet.org>2007-01-11 06:17:04 +0000
commitfdbe8a31be3fdb3867d8052972fbccab4f5613df (patch)
tree80f43d8fc8afe63daa70224835d21e4da67663f1 /package/xorg/xorg.mk
parent3a0a879172c47b686a06c1fabe578d089c7666d8 (diff)
more updates to ensure subsequent packages build
Diffstat (limited to 'package/xorg/xorg.mk')
-rw-r--r--package/xorg/xorg.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
index 37884c5c0..136f26af5 100644
--- a/package/xorg/xorg.mk
+++ b/package/xorg/xorg.mk
@@ -12,7 +12,7 @@ XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap xinit/startx \
mkfontscale/mkfontscale mkfontdir/mkfontdir \
#xterm/xterm
-XORG_LIBS:= Xft fontconfig expat Xrender Xaw Xmu Xt \
+XORG_LIBS:= Xft fontconfig Xrender Xaw Xmu Xt \
SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc
@@ -97,9 +97,8 @@ $(XORG_XSERVER): $(XORG_DIR)/.configured
touch -c $(XORG_XSERVER)
$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
- -mkdir -p $(STAGING_DIR)$(TARGET_LIBX)
- rm -f $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig
- ln -fs ../../../lib/pkgconfig $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig
+ -mkdir -p $(STAGING_DIR)/usr/X11R6
+ ln -fs ../../lib $(STAGING_DIR)$(TARGET_LIBX)
( cd $(XORG_DIR); $(MAKE) \
DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
$(SED) 's,/usr/X11R6,$(STAGING_DIR)/usr/X11R6,' $(STAGING_DIR)/usr/X11R6/lib/pkgconfig/*.pc
@@ -144,7 +143,8 @@ $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER)
touch -c $(XORG_LIBX)/libX11.so.6.2
-xorg: zlib png pkgconfig freetype $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
+xorg: zlib png pkgconfig expat freetype \
+ $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
xorg-source: $(DL_DIR)/$(XORG_SOURCE)