diff options
Diffstat (limited to 'package/xorg/xorg.mk')
| -rw-r--r-- | package/xorg/xorg.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index 3fe94fcba..45c7cf129 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -102,7 +102,7 @@ $(XORG_DIR)/.configured: $(XORG_DIR)/.unpacked $(XORG_XSERVER): $(XORG_DIR)/.configured rm -f $(TARGET_XSERVER) $(XORG_XSERVER) - ( cd $(XORG_DIR) ; $(MAKE) \ + ( cd $(XORG_DIR); $(MAKE) \ PKG_CONFIG=$(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY) \ World XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale ) touch -c $(XORG_XSERVER) @@ -122,17 +122,17 @@ $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER) $(TARGET_XSERVER): $(XORG_XSERVER) mkdir -p $(XORG_BINX) - for file in $(XORG_APPS) ; do \ - cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX) ; \ - chmod a+x $(XORG_PROGS)/$$file ; \ - $(STRIP) $(XORG_PROGS)/$$file || /bin/true ; \ + for file in $(XORG_APPS); do \ + cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX); \ + chmod a+x $(XORG_PROGS)/$$file; \ + $(STRIP) $(XORG_PROGS)/$$file || /bin/true; \ done cp $(XORG_XSERVER) $(TARGET_XSERVER) (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)/ - ( cd $(XORG_DIR)/fonts ; $(MAKE) \ + ( cd $(XORG_DIR)/fonts; $(MAKE) \ DESTDIR=$(TARGET_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale ) cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14.bdf $(XORG_LIBX)/X11/fonts/misc/ cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14-L1.bdf $(XORG_LIBX)/X11/fonts/misc/ @@ -188,16 +188,16 @@ $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf mkdir -p $(XORG_LIBX) - set -e; for dirs in $(XORG_LIBS) ; do \ - file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"` ; \ - $(STRIP) $(STRIP_STRIP_UNNEEDED) $$file ; \ - cp -f $$file $(XORG_LIBX) ; \ - file=`find $(XORG_LDIR)/$$dirs -type l -iname "*$$dirs.so*"` ; \ - cp -pRf $$file $(XORG_LIBX) ; \ + set -e; for dirs in $(XORG_LIBS); do \ + file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"`; \ + $(STRIP) $(STRIP_STRIP_UNNEEDED) $$file; \ + cp -f $$file $(XORG_LIBX); \ + file=`find $(XORG_LDIR)/$$dirs -type l -iname "*$$dirs.so*"`; \ + cp -pRf $$file $(XORG_LIBX); \ done (cd $(TARGET_DIR)/usr/lib; ln -snf $(TARGET_LIBX) X11) touch $(TARGET_DIR)/etc/ld.so.conf - if [ "`grep -c '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf`" = "0" ] ; then \ + if [ "`grep -c '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf`" = "0" ]; then \ echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf; \ fi touch -c $(XORG_LIBX)/libX11.so.6.2 |