Fix dependencies for a lot of xorg packages.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12522 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/XOrg/driver/template.mk b/XOrg/driver/template.mk
index 8375888..3b9db20 100644 (file)
--- a/XOrg/driver/template.mk
+++ b/XOrg/driver/template.mk
@@ -27,7 +27,7 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-input-evdev/Makefile b/XOrg/driver/xf86-input-evdev/Makefile
index 7d739d7..7d558f8 100644 (file)
--- a/XOrg/driver/xf86-input-evdev/Makefile
+++ b/XOrg/driver/xf86-input-evdev/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-input-evdev
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-input-keyboard/Makefile b/XOrg/driver/xf86-input-keyboard/Makefile
index 461e23d..0605373 100644 (file)
--- a/XOrg/driver/xf86-input-keyboard/Makefile
+++ b/XOrg/driver/xf86-input-keyboard/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-input-keyboard
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-input-mouse/Makefile b/XOrg/driver/xf86-input-mouse/Makefile
index 17200ff..e3d18f6 100644 (file)
--- a/XOrg/driver/xf86-input-mouse/Makefile
+++ b/XOrg/driver/xf86-input-mouse/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-input-mouse
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-video-ati/Makefile b/XOrg/driver/xf86-video-ati/Makefile
index afbe589..f746556 100644 (file)
--- a/XOrg/driver/xf86-video-ati/Makefile
+++ b/XOrg/driver/xf86-video-ati/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-video-ati
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-video-fbdev/Makefile b/XOrg/driver/xf86-video-fbdev/Makefile
index 677060a..45d195d 100644 (file)
--- a/XOrg/driver/xf86-video-fbdev/Makefile
+++ b/XOrg/driver/xf86-video-fbdev/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-video-fbdev
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-video-intel/Makefile b/XOrg/driver/xf86-video-intel/Makefile
index 62f7ceb..31f3744 100644 (file)
--- a/XOrg/driver/xf86-video-intel/Makefile
+++ b/XOrg/driver/xf86-video-intel/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-video-intel
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-video-nv/Makefile b/XOrg/driver/xf86-video-nv/Makefile
index 2b9535f..b8dccc9 100644 (file)
--- a/XOrg/driver/xf86-video-nv/Makefile
+++ b/XOrg/driver/xf86-video-nv/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-video-nv
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-video-vesa/Makefile b/XOrg/driver/xf86-video-vesa/Makefile
index e617190..61f834e 100644 (file)
--- a/XOrg/driver/xf86-video-vesa/Makefile
+++ b/XOrg/driver/xf86-video-vesa/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-video-vesa
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/driver/xf86-video-vga/Makefile b/XOrg/driver/xf86-video-vga/Makefile
index c2879a1..2013a06 100644 (file)
--- a/XOrg/driver/xf86-video-vga/Makefile
+++ b/XOrg/driver/xf86-video-vga/Makefile
@@ -27,7 +27,7 @@ define Package/xf86-video-vga
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/font/encodings/Makefile b/XOrg/font/encodings/Makefile
index d6061ad..00af6a4 100644 (file)
--- a/XOrg/font/encodings/Makefile
+++ b/XOrg/font/encodings/Makefile
@@ -27,7 +27,7 @@ define Package/encodings
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-alias/Makefile b/XOrg/font/font-alias/Makefile
index f730291..7644640 100644 (file)
--- a/XOrg/font/font-alias/Makefile
+++ b/XOrg/font/font-alias/Makefile
@@ -27,7 +27,7 @@ define Package/font-alias
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-bh-75dpi/Makefile b/XOrg/font/font-bh-75dpi/Makefile
index b4117d9..26d3980 100644 (file)
--- a/XOrg/font/font-bh-75dpi/Makefile
+++ b/XOrg/font/font-bh-75dpi/Makefile
@@ -27,7 +27,7 @@ define Package/font-bh-75dpi
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-cursor-misc/Makefile b/XOrg/font/font-cursor-misc/Makefile
index 0788076..7dcf9bb 100644 (file)
--- a/XOrg/font/font-cursor-misc/Makefile
+++ b/XOrg/font/font-cursor-misc/Makefile
@@ -27,7 +27,7 @@ define Package/font-cursor-misc
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-daewoo-misc/Makefile b/XOrg/font/font-daewoo-misc/Makefile
index 3315036..55e7549 100644 (file)
--- a/XOrg/font/font-daewoo-misc/Makefile
+++ b/XOrg/font/font-daewoo-misc/Makefile
@@ -27,7 +27,7 @@ define Package/font-daewoo-misc
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-dec-misc/Makefile b/XOrg/font/font-dec-misc/Makefile
index eb761b5..030813f 100644 (file)
--- a/XOrg/font/font-dec-misc/Makefile
+++ b/XOrg/font/font-dec-misc/Makefile
@@ -27,7 +27,7 @@ define Package/font-dec-misc
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-ibm-type1/Makefile b/XOrg/font/font-ibm-type1/Makefile
index 9d462e1..052b3ce 100644 (file)
--- a/XOrg/font/font-ibm-type1/Makefile
+++ b/XOrg/font/font-ibm-type1/Makefile
@@ -27,7 +27,7 @@ define Package/font-ibm-type1
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-isas-misc/Makefile b/XOrg/font/font-isas-misc/Makefile
index 7697a79..b0ff8cb 100644 (file)
--- a/XOrg/font/font-isas-misc/Makefile
+++ b/XOrg/font/font-isas-misc/Makefile
@@ -27,7 +27,7 @@ define Package/font-isas-misc
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-jis-misc/Makefile b/XOrg/font/font-jis-misc/Makefile
index 4e5dc86..ffe2bc1 100644 (file)
--- a/XOrg/font/font-jis-misc/Makefile
+++ b/XOrg/font/font-jis-misc/Makefile
@@ -27,7 +27,7 @@ define Package/font-jis-misc
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-micro-misc/Makefile b/XOrg/font/font-micro-misc/Makefile
index b1b9456..6415fa6 100644 (file)
--- a/XOrg/font/font-micro-misc/Makefile
+++ b/XOrg/font/font-micro-misc/Makefile
@@ -27,7 +27,7 @@ define Package/font-micro-misc
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-misc-cyrillic/Makefile b/XOrg/font/font-misc-cyrillic/Makefile
index 699f615..9c2b4ee 100644 (file)
--- a/XOrg/font/font-misc-cyrillic/Makefile
+++ b/XOrg/font/font-misc-cyrillic/Makefile
@@ -27,7 +27,7 @@ define Package/font-misc-cyrillic
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/font-xfree86-type1/Makefile b/XOrg/font/font-xfree86-type1/Makefile
index d469198..11e599d 100644 (file)
--- a/XOrg/font/font-xfree86-type1/Makefile
+++ b/XOrg/font/font-xfree86-type1/Makefile
@@ -27,7 +27,7 @@ define Package/font-xfree86-type1
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/font/template.mk b/XOrg/font/template.mk
index f6abfcc..149f894 100644 (file)
--- a/XOrg/font/template.mk
+++ b/XOrg/font/template.mk
@@ -27,7 +27,7 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201

diff --git a/XOrg/generate.sh b/XOrg/generate.sh
index 9a99ba3..21e5157 100755 (executable)
--- a/XOrg/generate.sh
+++ b/XOrg/generate.sh
@@ -10,14 +10,18 @@ for d in `find . -name packages`; do
                DEP=`echo ${p##*|} | sed "s/+/ +/g"`
                echo generating Makefile for ${NAME}-${VER} with deps : ${DEP}
                rm -f ${NAME}/Makefile
-        rm -f ${NAME}/patches/*
+        if [ -e ${NAME}/patches ]; then
+            rm -f ${NAME}/patches/*
+        fi
                if [ "$1" = "gen" ]; then
                        if [ ! -e ${NAME} ]; then
                 mkdir ${NAME}
             fi
                        sed "s/@VER@/${VER}/g" template.mk | sed "s/@DEP@/${DEP}/g" | sed "s/@NAME@/${NAME}/g" | sed "s/@BASE_NAME@/${BASE_NAME}/g" > ${NAME}/Makefile
                        if [ -d `pwd`/patches/${NAME} ]; then
-                               mkdir ${NAME}/patches
+                               if [ ! -d ${NAME}/patches ]; then
+                    mkdir ${NAME}/patches
+                fi
                                cp -r `pwd`/patches/${NAME}/* ${NAME}/patches/
                        fi
                fi

diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile
index d2d012c..e722c1f 100644 (file)
--- a/XOrg/lib/libICE/Makefile
+++ b/XOrg/lib/libICE/Makefile
@@ -26,10 +26,6 @@ define Package/libICE
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libICE,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libICE))

diff --git a/XOrg/lib/libSM/Makefile b/XOrg/lib/libSM/Makefile
index c6622ac..44fefb4 100644 (file)
--- a/XOrg/lib/libSM/Makefile
+++ b/XOrg/lib/libSM/Makefile
@@ -21,15 +21,11 @@ define Package/libSM
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +libICE @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +xproto +xtrans +libICE @DISPLAY_SUPPORT
   TITLE:=libSM
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libSM,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libSM))

diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile
index 4ae4fe6..4dde4dc 100644 (file)
--- a/XOrg/lib/libX11/Makefile
+++ b/XOrg/lib/libX11/Makefile
@@ -15,23 +15,17 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
-PKG_FIXUP = libtool
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libX11
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +bigreqsproto +xproto +xextproto +libXau +xtrans +xcmiscproto +libXdmcp +xf86bigfontproto +kbproto +inputproto @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +bigreqsproto +xproto +xextproto +xtrans +xcmiscproto +libXdmcp +xf86bigfontproto +kbproto +inputproto +libXau @DISPLAY_SUPPORT
   TITLE:=libX11
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libX11,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -51,6 +45,7 @@ define Build/Compile
        make -C $(PKG_BUILD_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
@@ -72,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libX11))

diff --git a/XOrg/lib/libXau/Makefile b/XOrg/lib/libXau/Makefile
index f63f9e9..5b2b4bf 100644 (file)
--- a/XOrg/lib/libXau/Makefile
+++ b/XOrg/lib/libXau/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
-PKG_FIXUP = libtool
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXau
@@ -28,10 +26,6 @@ define Package/libXau
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXau,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -51,6 +45,7 @@ define Build/Compile
        make -C $(PKG_BUILD_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
@@ -72,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXau))

diff --git a/XOrg/lib/libXaw/Makefile b/XOrg/lib/libXaw/Makefile
index 676c3ad..91b4203 100644 (file)
--- a/XOrg/lib/libXaw/Makefile
+++ b/XOrg/lib/libXaw/Makefile
@@ -21,15 +21,11 @@ define Package/libXaw
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +libXmu +libXpm +libXau +libXdmcp @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +xproto +libX11 +libXext +xextproto +libXt +libXmu +libXmu +libXpm +libXp +printproto +libXau @DISPLAY_SUPPORT
   TITLE:=libXaw
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXaw,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXaw))

diff --git a/XOrg/lib/libXcursor/Makefile b/XOrg/lib/libXcursor/Makefile
index 88e3cc9..1424c85 100644 (file)
--- a/XOrg/lib/libXcursor/Makefile
+++ b/XOrg/lib/libXcursor/Makefile
@@ -26,10 +26,6 @@ define Package/libXcursor
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXcursor,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXcursor))

diff --git a/XOrg/lib/libXdmcp/Makefile b/XOrg/lib/libXdmcp/Makefile
index 7d6d54c..daf52df 100644 (file)
--- a/XOrg/lib/libXdmcp/Makefile
+++ b/XOrg/lib/libXdmcp/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
-PKG_FIXUP = libtool
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXdmcp
@@ -28,10 +26,6 @@ define Package/libXdmcp
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXdmcp,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -51,6 +45,7 @@ define Build/Compile
        make -C $(PKG_BUILD_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
@@ -72,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXdmcp))

diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile
index 867d3e8..a6567e2 100644 (file)
--- a/XOrg/lib/libXext/Makefile
+++ b/XOrg/lib/libXext/Makefile
@@ -15,23 +15,17 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
-PKG_FIXUP = libtool
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXext
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +xproto +xextproto +libXau +libX11 @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +xproto +xextproto +libX11 +libXau @DISPLAY_SUPPORT
   TITLE:=libXext
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXext,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -51,6 +45,7 @@ define Build/Compile
        make -C $(PKG_BUILD_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
@@ -72,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXext))

diff --git a/XOrg/lib/libXfixes/Makefile b/XOrg/lib/libXfixes/Makefile
index 1c092d8..3ddc029 100644 (file)
--- a/XOrg/lib/libXfixes/Makefile
+++ b/XOrg/lib/libXfixes/Makefile
@@ -21,15 +21,11 @@ define Package/libXfixes
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +xproto +fixesproto +xextproto +libX11 @DISPLAY_SUPPORT
   TITLE:=libXfixes
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXfixes,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXfixes))

diff --git a/XOrg/lib/libXfont/Makefile b/XOrg/lib/libXfont/Makefile
index 80bf716..92be470 100644 (file)
--- a/XOrg/lib/libXfont/Makefile
+++ b/XOrg/lib/libXfont/Makefile
@@ -21,15 +21,11 @@ define Package/libXfont
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +zlib +libfontenc +fontcacheproto +fontsproto +libfreetype @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +zlib +xproto +xtrans +libfontenc +fontcacheproto +fontsproto +libfreetype @DISPLAY_SUPPORT
   TITLE:=libXfont
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXfont,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXfont))

diff --git a/XOrg/lib/libXmu/Makefile b/XOrg/lib/libXmu/Makefile
index 1517629..621d946 100644 (file)
--- a/XOrg/lib/libXmu/Makefile
+++ b/XOrg/lib/libXmu/Makefile
@@ -21,15 +21,11 @@ define Package/libXmu
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros +libXt +libXext @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +libXt +libXext +xextproto @DISPLAY_SUPPORT
   TITLE:=libXmu
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXmu,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXmu))

diff --git a/XOrg/lib/libXpm/Makefile b/XOrg/lib/libXpm/Makefile
index e92fee3..e31c0a5 100644 (file)
--- a/XOrg/lib/libXpm/Makefile
+++ b/XOrg/lib/libXpm/Makefile
@@ -21,15 +21,11 @@ define Package/libXpm
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +xproto +libX11 @DISPLAY_SUPPORT
   TITLE:=libXpm
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXpm,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXpm))

diff --git a/XOrg/lib/libXrandr/Makefile b/XOrg/lib/libXrandr/Makefile
index 184cffa..6dd1ecb 100644 (file)
--- a/XOrg/lib/libXrandr/Makefile
+++ b/XOrg/lib/libXrandr/Makefile
@@ -26,10 +26,6 @@ define Package/libXrandr
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXrandr,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXrandr))

diff --git a/XOrg/lib/libXrender/Makefile b/XOrg/lib/libXrender/Makefile
index c3203e5..22f3bb7 100644 (file)
--- a/XOrg/lib/libXrender/Makefile
+++ b/XOrg/lib/libXrender/Makefile
@@ -21,15 +21,11 @@ define Package/libXrender
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +libX11 +renderproto @DISPLAY_SUPPORT
   TITLE:=libXrender
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXrender,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXrender))

diff --git a/XOrg/lib/libXt/Makefile b/XOrg/lib/libXt/Makefile
index 2069839..af4622e 100644 (file)
--- a/XOrg/lib/libXt/Makefile
+++ b/XOrg/lib/libXt/Makefile
@@ -21,15 +21,11 @@ define Package/libXt
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +libSM @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +libSM +libX11 +xproto +kbproto @DISPLAY_SUPPORT
   TITLE:=libXt
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXt,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXt))

diff --git a/XOrg/lib/libXv/Makefile b/XOrg/lib/libXv/Makefile
index 1ac79ad..bcfe985 100644 (file)
--- a/XOrg/lib/libXv/Makefile
+++ b/XOrg/lib/libXv/Makefile
@@ -26,10 +26,6 @@ define Package/libXv
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXv,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXv))

diff --git a/XOrg/lib/libXvMC/Makefile b/XOrg/lib/libXvMC/Makefile
index 157a81c..9d95d89 100644 (file)
--- a/XOrg/lib/libXvMC/Makefile
+++ b/XOrg/lib/libXvMC/Makefile
@@ -26,10 +26,6 @@ define Package/libXvMC
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXvMC,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXvMC))

diff --git a/XOrg/lib/libXxf86misc/Makefile b/XOrg/lib/libXxf86misc/Makefile
index 4ba01f4..d0a7fbd 100644 (file)
--- a/XOrg/lib/libXxf86misc/Makefile
+++ b/XOrg/lib/libXxf86misc/Makefile
@@ -21,15 +21,11 @@ define Package/libXxf86misc
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +xproto +libX11 +xextproto +libXext +xf86miscproto @DISPLAY_SUPPORT
   TITLE:=libXxf86misc
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXxf86misc,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXxf86misc))

diff --git a/XOrg/lib/libXxf86vm/Makefile b/XOrg/lib/libXxf86vm/Makefile
index 4cc0b15..fed612f 100644 (file)
--- a/XOrg/lib/libXxf86vm/Makefile
+++ b/XOrg/lib/libXxf86vm/Makefile
@@ -21,15 +21,11 @@ define Package/libXxf86vm
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +xproto +libX11 +xextproto +libXext +xf86vidmodeproto @DISPLAY_SUPPORT
   TITLE:=libXxf86vm
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libXxf86vm,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libXxf86vm))

diff --git a/XOrg/lib/libfontenc/Makefile b/XOrg/lib/libfontenc/Makefile
index 3531449..da2d718 100644 (file)
--- a/XOrg/lib/libfontenc/Makefile
+++ b/XOrg/lib/libfontenc/Makefile
@@ -26,10 +26,6 @@ define Package/libfontenc
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libfontenc,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libfontenc))

diff --git a/XOrg/lib/libmatchbox/Makefile b/XOrg/lib/libmatchbox/Makefile
index dbaeb6a..d4196aa 100644 (file)
--- a/XOrg/lib/libmatchbox/Makefile
+++ b/XOrg/lib/libmatchbox/Makefile
@@ -14,8 +14,9 @@ PKG_SOURCE_URL:=http://matchbox-project.org/sources/libmatchbox/$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=9f73e7515cc4679171a5db180dc1343b
 PKG_BUILD_DIR=$(BUILD_DIR)/${PKG_NAME}-$(PKG_VERSION)
+PKG_FIXUP:=libtool
 
-PKG_FIXUP = libtool
+EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/XOrg/lib/libxkbfile/Makefile b/XOrg/lib/libxkbfile/Makefile
index a376ea1..604ab43 100644 (file)
--- a/XOrg/lib/libxkbfile/Makefile
+++ b/XOrg/lib/libxkbfile/Makefile
@@ -21,15 +21,11 @@ define Package/libxkbfile
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +libX11 +kbproto @DISPLAY_SUPPORT
   TITLE:=libxkbfile
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libxkbfile,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libxkbfile))

diff --git a/XOrg/lib/libxkbui/Makefile b/XOrg/lib/libxkbui/Makefile
index 270669f..7282fa0 100644 (file)
--- a/XOrg/lib/libxkbui/Makefile
+++ b/XOrg/lib/libxkbui/Makefile
@@ -21,15 +21,11 @@ define Package/libxkbui
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +libX11 +libXt +libxkbfile @DISPLAY_SUPPORT
   TITLE:=libxkbui
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (libxkbui,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,libxkbui))

diff --git a/XOrg/lib/packages b/XOrg/lib/packages
index 55ccfdc..055652f 100644 (file)
--- a/XOrg/lib/packages
+++ b/XOrg/lib/packages
@@ -1,23 +1,23 @@
 libfontenc-1.0.4|+xproto+zlib
 libICE-1.0.4|+xproto+xtrans
-libSM-1.0.3|+libICE
-libX11-1.1.3|+bigreqsproto+xproto+xextproto+libXau+xtrans+xcmiscproto+libXdmcp+xf86bigfontproto+kbproto+inputproto
+libSM-1.0.3|+xproto+xtrans+libICE
+libX11-1.1.3|+bigreqsproto+xproto+xextproto+xtrans+xcmiscproto+libXdmcp+xf86bigfontproto+kbproto+inputproto+libXau
 libXau-1.0.3|+xproto
-libXaw-1.0.4|+libXmu+libXpm+libXau+libXdmcp
+libXaw-1.0.4|+xproto+libX11+libXext+xextproto+libXt+libXmu+libXmu+libXpm+libXp+printproto+libXau
 libXcursor-1.1.9|+libXrender+libXfixes
 libXdmcp-1.0.2|+xproto
-libXext-1.0.2|+xproto+xextproto+libXau+libX11
-libXfixes-4.0.3|
-libXfont-1.3.1|+zlib+libfontenc+fontcacheproto+fontsproto+libfreetype
-libxkbfile-1.0.4|
-libxkbui-1.0.2|
-libXmu-1.0.3|+libXt +libXext
-libXpm-3.5.7|
+libXext-1.0.2|+xproto+xextproto+libX11+libXau
+libXfixes-4.0.3|+xproto+fixesproto+xextproto+libX11
+libXfont-1.3.1|+zlib+xproto+xtrans+libfontenc+fontcacheproto+fontsproto+libfreetype
+libxkbfile-1.0.4|+libX11+kbproto
+libxkbui-1.0.2|+libX11+libXt+libxkbfile
+libXmu-1.0.3|+libXt+libXext+xextproto
+libXpm-3.5.7|+xproto+libX11
 libXrandr-1.2.2|+libXext+libXrender+randrproto+renderproto+xextproto+libX11
-libXrender-0.9.4|+libfreetype+zlib+xproto+libfontenc+xtrans+fontsproto+renderproto
-libXt-1.0.4|+libSM
+libXrender-0.9.4|+libX11+renderproto
+libXt-1.0.4|+libSM+libX11+xproto+kbproto
 libXv-1.0.3|+libXext+videoproto
 libXvMC-1.0.4|+libXext+videoproto+libXv
-libXxf86misc-1.0.1|
-libXxf86vm-1.0.1|
+libXxf86misc-1.0.1|+xproto+libX11+xextproto+libXext+xf86miscproto
+libXxf86vm-1.0.1|+xproto+libX11+xextproto+libXext+xf86vidmodeproto
 xtrans-1.0.4|

diff --git a/XOrg/lib/template.mk b/XOrg/lib/template.mk
index 40a8fd4..5b4bd9d 100644 (file)
--- a/XOrg/lib/template.mk
+++ b/XOrg/lib/template.mk
@@ -26,10 +26,6 @@ define Package/@NAME@
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (@NAME@,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,@NAME@))

diff --git a/XOrg/lib/xtrans/Makefile b/XOrg/lib/xtrans/Makefile
index e9ef224..60f6485 100644 (file)
--- a/XOrg/lib/xtrans/Makefile
+++ b/XOrg/lib/xtrans/Makefile
@@ -26,10 +26,6 @@ define Package/xtrans
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
 ifeq (xtrans,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif
@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,xtrans))

diff --git a/XOrg/proto/applewmproto/Makefile b/XOrg/proto/applewmproto/Makefile
index 7f086c4..f9fc1c5 100644 (file)
--- a/XOrg/proto/applewmproto/Makefile
+++ b/XOrg/proto/applewmproto/Makefile
@@ -26,7 +26,7 @@ define Package/applewmproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/bigreqsproto/Makefile b/XOrg/proto/bigreqsproto/Makefile
index 485fb7a..f87bb10 100644 (file)
--- a/XOrg/proto/bigreqsproto/Makefile
+++ b/XOrg/proto/bigreqsproto/Makefile
@@ -26,7 +26,7 @@ define Package/bigreqsproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/compositeproto/Makefile b/XOrg/proto/compositeproto/Makefile
index cda993f..6a488de 100644 (file)
--- a/XOrg/proto/compositeproto/Makefile
+++ b/XOrg/proto/compositeproto/Makefile
@@ -26,7 +26,7 @@ define Package/compositeproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/damageproto/Makefile b/XOrg/proto/damageproto/Makefile
index 799ca78..ee98164 100644 (file)
--- a/XOrg/proto/damageproto/Makefile
+++ b/XOrg/proto/damageproto/Makefile
@@ -26,7 +26,7 @@ define Package/damageproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/dmxproto/Makefile b/XOrg/proto/dmxproto/Makefile
index 925f72c..85998a6 100644 (file)
--- a/XOrg/proto/dmxproto/Makefile
+++ b/XOrg/proto/dmxproto/Makefile
@@ -26,7 +26,7 @@ define Package/dmxproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/evieext/Makefile b/XOrg/proto/evieext/Makefile
index 35bf46b..d776a56 100644 (file)
--- a/XOrg/proto/evieext/Makefile
+++ b/XOrg/proto/evieext/Makefile
@@ -26,7 +26,7 @@ define Package/evieext
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/fixesproto/Makefile b/XOrg/proto/fixesproto/Makefile
index f7c307e..f75a8b8 100644 (file)
--- a/XOrg/proto/fixesproto/Makefile
+++ b/XOrg/proto/fixesproto/Makefile
@@ -26,7 +26,7 @@ define Package/fixesproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/fontcacheproto/Makefile b/XOrg/proto/fontcacheproto/Makefile
index db66be5..f504c6e 100644 (file)
--- a/XOrg/proto/fontcacheproto/Makefile
+++ b/XOrg/proto/fontcacheproto/Makefile
@@ -26,7 +26,7 @@ define Package/fontcacheproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/fontsproto/Makefile b/XOrg/proto/fontsproto/Makefile
index 4bbc0fc..8b17387 100644 (file)
--- a/XOrg/proto/fontsproto/Makefile
+++ b/XOrg/proto/fontsproto/Makefile
@@ -26,7 +26,7 @@ define Package/fontsproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/glproto/Makefile b/XOrg/proto/glproto/Makefile
index 2179f95..3365214 100644 (file)
--- a/XOrg/proto/glproto/Makefile
+++ b/XOrg/proto/glproto/Makefile
@@ -26,7 +26,7 @@ define Package/glproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/inputproto/Makefile b/XOrg/proto/inputproto/Makefile
index 5ef6445..ce0ea77 100644 (file)
--- a/XOrg/proto/inputproto/Makefile
+++ b/XOrg/proto/inputproto/Makefile
@@ -26,7 +26,7 @@ define Package/inputproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/kbproto/Makefile b/XOrg/proto/kbproto/Makefile
index 5cd2b5a..a11aac9 100644 (file)
--- a/XOrg/proto/kbproto/Makefile
+++ b/XOrg/proto/kbproto/Makefile
@@ -26,7 +26,7 @@ define Package/kbproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/printproto/Makefile b/XOrg/proto/printproto/Makefile
index dd9efec..33d5391 100644 (file)
--- a/XOrg/proto/printproto/Makefile
+++ b/XOrg/proto/printproto/Makefile
@@ -26,7 +26,7 @@ define Package/printproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/randrproto/Makefile b/XOrg/proto/randrproto/Makefile
index e6ac38b..cdc7861 100644 (file)
--- a/XOrg/proto/randrproto/Makefile
+++ b/XOrg/proto/randrproto/Makefile
@@ -26,7 +26,7 @@ define Package/randrproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/recordproto/Makefile b/XOrg/proto/recordproto/Makefile
index c306180..78d32a7 100644 (file)
--- a/XOrg/proto/recordproto/Makefile
+++ b/XOrg/proto/recordproto/Makefile
@@ -26,7 +26,7 @@ define Package/recordproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/renderproto/Makefile b/XOrg/proto/renderproto/Makefile
index 542f4c0..c4ea38e 100644 (file)
--- a/XOrg/proto/renderproto/Makefile
+++ b/XOrg/proto/renderproto/Makefile
@@ -26,7 +26,7 @@ define Package/renderproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/resourceproto/Makefile b/XOrg/proto/resourceproto/Makefile
index e37ec4a..d752a43 100644 (file)
--- a/XOrg/proto/resourceproto/Makefile
+++ b/XOrg/proto/resourceproto/Makefile
@@ -26,7 +26,7 @@ define Package/resourceproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/scrnsaverproto/Makefile b/XOrg/proto/scrnsaverproto/Makefile
index 83356a0..fc049e3 100644 (file)
--- a/XOrg/proto/scrnsaverproto/Makefile
+++ b/XOrg/proto/scrnsaverproto/Makefile
@@ -26,7 +26,7 @@ define Package/scrnsaverproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/template.mk b/XOrg/proto/template.mk
index c470ca7..ac5bb23 100644 (file)
--- a/XOrg/proto/template.mk
+++ b/XOrg/proto/template.mk
@@ -26,7 +26,7 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/trapproto/Makefile b/XOrg/proto/trapproto/Makefile
index 1de23fa..82490ea 100644 (file)
--- a/XOrg/proto/trapproto/Makefile
+++ b/XOrg/proto/trapproto/Makefile
@@ -26,7 +26,7 @@ define Package/trapproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/videoproto/Makefile b/XOrg/proto/videoproto/Makefile
index cd5b20a..1aa2710 100644 (file)
--- a/XOrg/proto/videoproto/Makefile
+++ b/XOrg/proto/videoproto/Makefile
@@ -26,7 +26,7 @@ define Package/videoproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/windowswmproto/Makefile b/XOrg/proto/windowswmproto/Makefile
index c3de8d4..23e1732 100644 (file)
--- a/XOrg/proto/windowswmproto/Makefile
+++ b/XOrg/proto/windowswmproto/Makefile
@@ -26,7 +26,7 @@ define Package/windowswmproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xcmiscproto/Makefile b/XOrg/proto/xcmiscproto/Makefile
index 0b88e6b..c02c935 100644 (file)
--- a/XOrg/proto/xcmiscproto/Makefile
+++ b/XOrg/proto/xcmiscproto/Makefile
@@ -26,7 +26,7 @@ define Package/xcmiscproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xextproto/Makefile b/XOrg/proto/xextproto/Makefile
index 7caff6d..cc25d03 100644 (file)
--- a/XOrg/proto/xextproto/Makefile
+++ b/XOrg/proto/xextproto/Makefile
@@ -26,7 +26,7 @@ define Package/xextproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86bigfontproto/Makefile b/XOrg/proto/xf86bigfontproto/Makefile
index 91995bd..1120dcd 100644 (file)
--- a/XOrg/proto/xf86bigfontproto/Makefile
+++ b/XOrg/proto/xf86bigfontproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86bigfontproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86dgaproto/Makefile b/XOrg/proto/xf86dgaproto/Makefile
index 1660343..c20c43c 100644 (file)
--- a/XOrg/proto/xf86dgaproto/Makefile
+++ b/XOrg/proto/xf86dgaproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86dgaproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86driproto/Makefile b/XOrg/proto/xf86driproto/Makefile
index cda2f05..6b5c94e 100644 (file)
--- a/XOrg/proto/xf86driproto/Makefile
+++ b/XOrg/proto/xf86driproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86driproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86miscproto/Makefile b/XOrg/proto/xf86miscproto/Makefile
index 181f39b..1233583 100644 (file)
--- a/XOrg/proto/xf86miscproto/Makefile
+++ b/XOrg/proto/xf86miscproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86miscproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86rushproto/Makefile b/XOrg/proto/xf86rushproto/Makefile
index 47b76a6..f380d4f 100644 (file)
--- a/XOrg/proto/xf86rushproto/Makefile
+++ b/XOrg/proto/xf86rushproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86rushproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86vidmodeproto/Makefile b/XOrg/proto/xf86vidmodeproto/Makefile
index e9966b3..fd0a85e 100644 (file)
--- a/XOrg/proto/xf86vidmodeproto/Makefile
+++ b/XOrg/proto/xf86vidmodeproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86vidmodeproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xineramaproto/Makefile b/XOrg/proto/xineramaproto/Makefile
index 65d0937..44c7eca 100644 (file)
--- a/XOrg/proto/xineramaproto/Makefile
+++ b/XOrg/proto/xineramaproto/Makefile
@@ -26,7 +26,7 @@ define Package/xineramaproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xproto/Makefile b/XOrg/proto/xproto/Makefile
index 4109f9c..bfb0f45 100644 (file)
--- a/XOrg/proto/xproto/Makefile
+++ b/XOrg/proto/xproto/Makefile
@@ -26,7 +26,7 @@ define Package/xproto
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xproxymanagementprotocol/Makefile b/XOrg/proto/xproxymanagementprotocol/Makefile
index 31219e2..d93878e 100644 (file)
--- a/XOrg/proto/xproxymanagementprotocol/Makefile
+++ b/XOrg/proto/xproxymanagementprotocol/Makefile
@@ -26,7 +26,7 @@ define Package/xproxymanagementprotocol
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 define Build/Compile

diff --git a/XOrg/utils/template.mk b/XOrg/utils/template.mk
index c9735e5..38cccf3 100644 (file)
--- a/XOrg/utils/template.mk
+++ b/XOrg/utils/template.mk
@@ -26,7 +26,7 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 define Build/Configure

diff --git a/XOrg/utils/util-macros/Makefile b/XOrg/utils/util-macros/Makefile
index d11731c..6e7a167 100644 (file)
--- a/XOrg/utils/util-macros/Makefile
+++ b/XOrg/utils/util-macros/Makefile
@@ -26,7 +26,7 @@ define Package/util-macros
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 define Build/Configure