Fix dependencies for a lot of xorg packages.

SVN-Revision: 12522

diff --git a/XOrg/driver/template.mk b/XOrg/driver/template.mk
index 8375888dbca5be9944f38c2858c8eab19b47a521..3b9db20b779f3052dcf2ecd19094d55f4baba056 100644 (file)
--- a/XOrg/driver/template.mk
+++ b/XOrg/driver/template.mk
@@ -27,7 +27,7 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
 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 \
 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 7d739d7175f4d051d0f60ae5967f89b08811bc03..7d558f8b6ac5655a1a391a0443a9a67bab185af0 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
 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 \
 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 461e23df57b415329d0f4cf6ff3b024977a20820..060537370fd0f45e348e39acd2609fcb240621b8 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
 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 \
 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 17200ffafabbc6527ed9fe334c7d8c8c9db3dc38..e3d18f6c2b63b2105c09c80a8a8d407e67ac544a 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
 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 \
 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 afbe58957e0ff80b6f39b3858bf66ddeea3dcf1e..f7465566feb9339cae91f5cf7a8dc8e8a86fa5f8 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
 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 \
 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 677060a98280c70597a64adb498957e02f700378..45d195d6a5159126f75d84ecdb37980c5a898423 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
 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 \
 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 62f7ceb76de98f364acc0f744d912c52d994fcb4..31f374435281418885a0b178b26c8cf82fd4ec3c 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
 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 \
 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 2b9535fe37e37afb099ff96c65940150967eec65..b8dccc949cd89a5e15bb61809c3de19ce87ee556 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
 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 \
 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 e617190e45d7336f01f103b33a68bbe40ec58cb6..61f834eee927a60ce70704b6b26c26fea2f3d1f1 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
 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 \
 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 c2879a196ecc437fec5263feb740c3c70e70dd89..2013a0634e34900136b96f1b582476ba8ad5c8eb 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
 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 \
 endef
 
 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \

diff --git a/XOrg/font/encodings/Makefile b/XOrg/font/encodings/Makefile
index d6061ad6fabd8506683da7c324d8675a3ce7fc2f..00af6a402aed41ee6cb0c24dcd6e34be0fb59401 100644 (file)
--- a/XOrg/font/encodings/Makefile
+++ b/XOrg/font/encodings/Makefile
@@ -27,7 +27,7 @@ define Package/encodings
 endef
 
 define Build/InstallDev
 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
 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 f730291cd735515facf515910fbacad7e818f0f0..7644640527605cf483c35a8d1e82d33c69abe63a 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
 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
 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 b4117d9a820f0985089fa9d132b37fd5a64546b7..26d3980565919b1109798f73495a4503a6e778dd 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
 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
 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 07880767cd9d7dbae6041f74480b2f149da2a976..7dcf9bb6ab3cd6e389e8a8cc37f4a081fc9b080d 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
 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
 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 331503685eeec4fad67a7c6fa14ed21d0209d674..55e7549e2f1d408010f4f2a9ed23ff6856a36db7 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
 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
 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 eb761b50eeb1452ad9bd386145aace0842139655..030813f294f163754016238ae4bfb390264459db 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
 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
 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 9d462e13857f3d762b532f66d118771debfffa2d..052b3ce4ddf1ae8e63d5498fcfa178bc1c04806c 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
 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
 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 7697a791efed6b82a46586901a42f0935beadc25..b0ff8cb6a05f122796c6d985d3ed7dadcf5f90b3 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
 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
 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 4e5dc865859ef48b6cd9b588d1a32783bf88e152..ffe2bc1c04f0acaebf67f7ec1126041bd2968a3e 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
 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
 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 b1b94561928fa23680d1bc0594e8fdbdade5a07c..6415fa63f61ecaf15f55eb8772f72c8f303d4fb5 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
 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
 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 699f615e383ad463addeb0e06dd80988f30f144e..9c2b4ee7888b8ccffbb244b7ec583c76003fe534 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
 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
 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 d469198bc28c8e30db5ce30f590135a7368a14ac..11e599d10d414d2fe81c31ed0e1af2f1cd7108c1 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
 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
 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 f6abfccf0a9fa13861a8e8e6521864d8e2ebff0a..149f8947012b9ceca28f8613fb868e335266c15d 100644 (file)
--- a/XOrg/font/template.mk
+++ b/XOrg/font/template.mk
@@ -27,7 +27,7 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
 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
 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 9a99ba33d129377523ef73728b3873d46f29d571..21e5157196592d67406cdec50aec386e98723485 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
                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
                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
                                cp -r `pwd`/patches/${NAME}/* ${NAME}/patches/
                        fi
                fi

diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile
index d2d012cb3a960953fb114d9003fd2e8368341706..e722c1fbf0b525089b7150fe1cb4e1171159464d 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
 
   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
 ifeq (libICE,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libICE))
 endef
 
 $(eval $(call BuildPackage,libICE))

diff --git a/XOrg/lib/libSM/Makefile b/XOrg/lib/libSM/Makefile
index c6622ac06137c174dffd498c9f9ac4583dbba59e..44fefb40fc1c7479407c80c47e326be92aa2642b 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
   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
 
   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
 ifeq (libSM,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libSM))
 endef
 
 $(eval $(call BuildPackage,libSM))

diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile
index 4ae4fe6c505a7d2310a7ad317138daf720f9bd48..4dde4dcd705fbce230236b16c7cd9337bf8d68ea 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_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
 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
 
   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
 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
        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
 endef
 
 define Build/Configure


@@ -72,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libX11))
 endef
 
 $(eval $(call BuildPackage,libX11))

diff --git a/XOrg/lib/libXau/Makefile b/XOrg/lib/libXau/Makefile
index f63f9e99b5b2e93d2e56f26974edc6c274bc92f9..5b2b4bf976f3da4669a6ddab6c38fd0712a2edf0 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_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
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXau


@@ -28,10 +26,6 @@ define Package/libXau
   URL:=http://xorg.freedesktop.org/
 endef
 
   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
 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
        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
 endef
 
 define Build/Configure


@@ -72,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXau))
 endef
 
 $(eval $(call BuildPackage,libXau))

diff --git a/XOrg/lib/libXaw/Makefile b/XOrg/lib/libXaw/Makefile
index 676c3ad415d218a72c56d7da9a75c6174dee071b..91b42031b4f0ef13d1744f513364585004faafed 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
   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
 
   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
 ifeq (libXaw,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXaw))
 endef
 
 $(eval $(call BuildPackage,libXaw))

diff --git a/XOrg/lib/libXcursor/Makefile b/XOrg/lib/libXcursor/Makefile
index 88e3cc9b6f43461f3cc73c239be23264f44f641b..1424c855e8db3a9c1612e338b11c18be4dd2825b 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
 
   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
 ifeq (libXcursor,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXcursor))
 endef
 
 $(eval $(call BuildPackage,libXcursor))

diff --git a/XOrg/lib/libXdmcp/Makefile b/XOrg/lib/libXdmcp/Makefile
index 7d6d54c6eb6b04303ab7e353b400540d5db15a6a..daf52dfcb60ac32aef18846eff705ebfb65ef37f 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_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
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXdmcp


@@ -28,10 +26,6 @@ define Package/libXdmcp
   URL:=http://xorg.freedesktop.org/
 endef
 
   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
 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
        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
 endef
 
 define Build/Configure


@@ -72,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXdmcp))
 endef
 
 $(eval $(call BuildPackage,libXdmcp))

diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile
index 867d3e8709bc3439cb42e6e23d3dd7711540700c..a6567e29550cd08d0bdb8de9f8ce9477e04aa842 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_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
 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
 
   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
 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
        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
 endef
 
 define Build/Configure


@@ -72,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXext))
 endef
 
 $(eval $(call BuildPackage,libXext))

diff --git a/XOrg/lib/libXfixes/Makefile b/XOrg/lib/libXfixes/Makefile
index 1c092d8ec15e33096e733e12bda2aa68a1b5637e..3ddc029dd1b1cb2c16c8fc49a3ee3f901e31c743 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
   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
 
   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
 ifeq (libXfixes,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXfixes))
 endef
 
 $(eval $(call BuildPackage,libXfixes))

diff --git a/XOrg/lib/libXfont/Makefile b/XOrg/lib/libXfont/Makefile
index 80bf7166ec2a306296bc8769dc858af38fd8846b..92be4705ffc21f520ac2416988ff631939a0efbd 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
   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
 
   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
 ifeq (libXfont,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXfont))
 endef
 
 $(eval $(call BuildPackage,libXfont))

diff --git a/XOrg/lib/libXmu/Makefile b/XOrg/lib/libXmu/Makefile
index 1517629e9d4d316f12926d513e4a1b16e08dd4f1..621d9467d5c7c82b70eae10c262e7c937654983c 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
   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
 
   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
 ifeq (libXmu,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXmu))
 endef
 
 $(eval $(call BuildPackage,libXmu))

diff --git a/XOrg/lib/libXpm/Makefile b/XOrg/lib/libXpm/Makefile
index e92fee3512ab527aecac6c9c54feab0bc0bcd502..e31c0a5545088207879c3e7f2f45a257c4578c35 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
   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
 
   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
 ifeq (libXpm,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXpm))
 endef
 
 $(eval $(call BuildPackage,libXpm))

diff --git a/XOrg/lib/libXrandr/Makefile b/XOrg/lib/libXrandr/Makefile
index 184cffad827d3d35a77d8b3cc5d3faa1252c46d3..6dd1ecb69c56564b2e768a3f4ede4e863694a574 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
 
   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
 ifeq (libXrandr,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXrandr))
 endef
 
 $(eval $(call BuildPackage,libXrandr))

diff --git a/XOrg/lib/libXrender/Makefile b/XOrg/lib/libXrender/Makefile
index c3203e5dd2195f6597f21aa171ee21db4f080d09..22f3bb7a7419d48b581bba2b0e748964c566850a 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
   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
 
   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
 ifeq (libXrender,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXrender))
 endef
 
 $(eval $(call BuildPackage,libXrender))

diff --git a/XOrg/lib/libXt/Makefile b/XOrg/lib/libXt/Makefile
index 2069839fb138a9cccd069cc81a72d40c7bf43461..af4622eac25b60b04bb985a89011638174df63ce 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
   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
 
   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
 ifeq (libXt,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXt))
 endef
 
 $(eval $(call BuildPackage,libXt))

diff --git a/XOrg/lib/libXv/Makefile b/XOrg/lib/libXv/Makefile
index 1ac79adba37ca7d3c93dcac820e34fee09cee1f5..bcfe985246c6e1a411ad7495dc182822766ba433 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
 
   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
 ifeq (libXv,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXv))
 endef
 
 $(eval $(call BuildPackage,libXv))

diff --git a/XOrg/lib/libXvMC/Makefile b/XOrg/lib/libXvMC/Makefile
index 157a81c261b30e6a7bc5958fcc6442c481f2c08b..9d95d894363531ecc15ba77ee0e582e36c847b06 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
 
   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
 ifeq (libXvMC,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXvMC))
 endef
 
 $(eval $(call BuildPackage,libXvMC))

diff --git a/XOrg/lib/libXxf86misc/Makefile b/XOrg/lib/libXxf86misc/Makefile
index 4ba01f455afbf5ab03c79668f9ee5d15c5a1cfdf..d0a7fbdeeed3bb86af9e1bfcab8e85c4159dabb5 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
   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
 
   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
 ifeq (libXxf86misc,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXxf86misc))
 endef
 
 $(eval $(call BuildPackage,libXxf86misc))

diff --git a/XOrg/lib/libXxf86vm/Makefile b/XOrg/lib/libXxf86vm/Makefile
index 4cc0b15b2367b713e3d0ede88caf9bacafe1a670..fed612f6e88fe21d6643dbf00b6c7998eb8311df 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
   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
 
   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
 ifeq (libXxf86vm,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libXxf86vm))
 endef
 
 $(eval $(call BuildPackage,libXxf86vm))

diff --git a/XOrg/lib/libfontenc/Makefile b/XOrg/lib/libfontenc/Makefile
index 3531449a9b9b57e89686d5ca984aa77d891f5234..da2d718379bed88f0b4f783605cdd9d97ad8a890 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
 
   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
 ifeq (libfontenc,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libfontenc))
 endef
 
 $(eval $(call BuildPackage,libfontenc))

diff --git a/XOrg/lib/libmatchbox/Makefile b/XOrg/lib/libmatchbox/Makefile
index dbaeb6a8ff07ea9181dbb1187ea5f8f5c2d825ec..d4196aad10a24c0f38cf3b07a8a02f8555870a01 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_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
 
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/XOrg/lib/libxkbfile/Makefile b/XOrg/lib/libxkbfile/Makefile
index a376ea1040d2c353b18381e27bfa95bfbf00cd8e..604ab43424c518c43f09fceed718b532133bcedc 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
   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
 
   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
 ifeq (libxkbfile,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libxkbfile))
 endef
 
 $(eval $(call BuildPackage,libxkbfile))

diff --git a/XOrg/lib/libxkbui/Makefile b/XOrg/lib/libxkbui/Makefile
index 270669fcea24f28b6323b3c27baaec8bba2b698a..7282fa0b8baca2d38b6c958c91db8d35378d7713 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
   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
 
   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
 ifeq (libxkbui,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,libxkbui))
 endef
 
 $(eval $(call BuildPackage,libxkbui))

diff --git a/XOrg/lib/packages b/XOrg/lib/packages
index 55ccfdc9878d0edc77c9d942cf4708f0b81445a0..055652f5a7171b26d138c921b23fe0ed467e2fad 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
 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
 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
 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
 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
 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|
 xtrans-1.0.4|

diff --git a/XOrg/lib/template.mk b/XOrg/lib/template.mk
index 40a8fd46e53704a70c2a616a3e61a412e201de5c..5b4bd9dfd593f302e3d1d6cabaaead1844edbd24 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
 
   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
 ifeq (@NAME@,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,@NAME@))
 endef
 
 $(eval $(call BuildPackage,@NAME@))

diff --git a/XOrg/lib/xtrans/Makefile b/XOrg/lib/xtrans/Makefile
index e9ef224711a41585cc052fa29221625783a15af7..60f6485c02a3bd5421ddf41b55c132967c98dd61 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
 
   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
 ifeq (xtrans,libX11)
  CONFIGURE_ARGS+=--without-xcb
 endif


@@ -71,7 +67,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)

 endef
 
 $(eval $(call BuildPackage,xtrans))
 endef
 
 $(eval $(call BuildPackage,xtrans))

diff --git a/XOrg/proto/applewmproto/Makefile b/XOrg/proto/applewmproto/Makefile
index 7f086c4217b4d3b825e84aab73c314cd0b17688a..f9fc1c5fe2c03ef7eb0bf95cebda844eafe89b04 100644 (file)
--- a/XOrg/proto/applewmproto/Makefile
+++ b/XOrg/proto/applewmproto/Makefile
@@ -26,7 +26,7 @@ define Package/applewmproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/bigreqsproto/Makefile b/XOrg/proto/bigreqsproto/Makefile
index 485fb7a8cddd4d58a45a9062c1187e8cbc1ae8cc..f87bb1040c488d739aa38d98e9bfa373eb076481 100644 (file)
--- a/XOrg/proto/bigreqsproto/Makefile
+++ b/XOrg/proto/bigreqsproto/Makefile
@@ -26,7 +26,7 @@ define Package/bigreqsproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/compositeproto/Makefile b/XOrg/proto/compositeproto/Makefile
index cda993f4762c6b5f8ec6c9e5db442cbb8468f7d2..6a488ded5528f162b7fffadee0edfa87ecf052fd 100644 (file)
--- a/XOrg/proto/compositeproto/Makefile
+++ b/XOrg/proto/compositeproto/Makefile
@@ -26,7 +26,7 @@ define Package/compositeproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/damageproto/Makefile b/XOrg/proto/damageproto/Makefile
index 799ca788ee2989854202a56f63b0a4a101c21584..ee981640df34036ea5a447094f8bc6ca1d06f19d 100644 (file)
--- a/XOrg/proto/damageproto/Makefile
+++ b/XOrg/proto/damageproto/Makefile
@@ -26,7 +26,7 @@ define Package/damageproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/dmxproto/Makefile b/XOrg/proto/dmxproto/Makefile
index 925f72cc15cd336f5950b3ecaca23089890a9875..85998a6e3b0639a4678f3f5597e81a84b5462546 100644 (file)
--- a/XOrg/proto/dmxproto/Makefile
+++ b/XOrg/proto/dmxproto/Makefile
@@ -26,7 +26,7 @@ define Package/dmxproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/evieext/Makefile b/XOrg/proto/evieext/Makefile
index 35bf46bb16551dd6845ede14cbb8d56bfac0edf5..d776a56a577c4b1b7b4d4f4de71890b1108fb713 100644 (file)
--- a/XOrg/proto/evieext/Makefile
+++ b/XOrg/proto/evieext/Makefile
@@ -26,7 +26,7 @@ define Package/evieext
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/fixesproto/Makefile b/XOrg/proto/fixesproto/Makefile
index f7c307ea2e2598e58c05f4e6e36232852c50c1ca..f75a8b8b3312c9fd88540b9e7783122d7daac7ba 100644 (file)
--- a/XOrg/proto/fixesproto/Makefile
+++ b/XOrg/proto/fixesproto/Makefile
@@ -26,7 +26,7 @@ define Package/fixesproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/fontcacheproto/Makefile b/XOrg/proto/fontcacheproto/Makefile
index db66be57ac7c481e324f000336ebb22d33c06ef7..f504c6e24b005e893a9e5e71890263a21b0b9d3d 100644 (file)
--- a/XOrg/proto/fontcacheproto/Makefile
+++ b/XOrg/proto/fontcacheproto/Makefile
@@ -26,7 +26,7 @@ define Package/fontcacheproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/fontsproto/Makefile b/XOrg/proto/fontsproto/Makefile
index 4bbc0fc4a3b669fd17e0198f1bc2acfec1ee837a..8b17387f367f08a4844a9de4b6f16ac45c876491 100644 (file)
--- a/XOrg/proto/fontsproto/Makefile
+++ b/XOrg/proto/fontsproto/Makefile
@@ -26,7 +26,7 @@ define Package/fontsproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/glproto/Makefile b/XOrg/proto/glproto/Makefile
index 2179f95faddfda7c332c1cb86698bb91b43fc988..3365214baa9dd61a86dddb38f641f39d96ae1380 100644 (file)
--- a/XOrg/proto/glproto/Makefile
+++ b/XOrg/proto/glproto/Makefile
@@ -26,7 +26,7 @@ define Package/glproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/inputproto/Makefile b/XOrg/proto/inputproto/Makefile
index 5ef6445302bb87e6e3791d1275061456952f19c1..ce0ea77c52dfbefed72cf90c72a966b9fb9fcc25 100644 (file)
--- a/XOrg/proto/inputproto/Makefile
+++ b/XOrg/proto/inputproto/Makefile
@@ -26,7 +26,7 @@ define Package/inputproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/kbproto/Makefile b/XOrg/proto/kbproto/Makefile
index 5cd2b5ae1719870abd5db18c785ca1af0ccfc4b8..a11aac950a4b3ac854fe069a40523a446d76120e 100644 (file)
--- a/XOrg/proto/kbproto/Makefile
+++ b/XOrg/proto/kbproto/Makefile
@@ -26,7 +26,7 @@ define Package/kbproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/printproto/Makefile b/XOrg/proto/printproto/Makefile
index dd9efec37c023be5ea13f61d577daf4dfb8cfc9e..33d53911372ff9e437daad3acf7790ba98cfa853 100644 (file)
--- a/XOrg/proto/printproto/Makefile
+++ b/XOrg/proto/printproto/Makefile
@@ -26,7 +26,7 @@ define Package/printproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/randrproto/Makefile b/XOrg/proto/randrproto/Makefile
index e6ac38bc03f3b9006a29204984a3c5b3bdb166bf..cdc7861194a3a2755eac05ef124b9019f93cd35e 100644 (file)
--- a/XOrg/proto/randrproto/Makefile
+++ b/XOrg/proto/randrproto/Makefile
@@ -26,7 +26,7 @@ define Package/randrproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/recordproto/Makefile b/XOrg/proto/recordproto/Makefile
index c3061808eb73c9adf126311d92df0dcd57e3a08a..78d32a71f6a9b19fa2cefc44707668f118bed070 100644 (file)
--- a/XOrg/proto/recordproto/Makefile
+++ b/XOrg/proto/recordproto/Makefile
@@ -26,7 +26,7 @@ define Package/recordproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/renderproto/Makefile b/XOrg/proto/renderproto/Makefile
index 542f4c089086eca86247b10dff06bd10401db6cd..c4ea38ebc9a0e9e2f7982d1a1b510dd8596dae7f 100644 (file)
--- a/XOrg/proto/renderproto/Makefile
+++ b/XOrg/proto/renderproto/Makefile
@@ -26,7 +26,7 @@ define Package/renderproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/resourceproto/Makefile b/XOrg/proto/resourceproto/Makefile
index e37ec4a52de466e0cefec4debd71ff02a165e152..d752a439cf9e5bac280dcf0bcf909f36ec38a323 100644 (file)
--- a/XOrg/proto/resourceproto/Makefile
+++ b/XOrg/proto/resourceproto/Makefile
@@ -26,7 +26,7 @@ define Package/resourceproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/scrnsaverproto/Makefile b/XOrg/proto/scrnsaverproto/Makefile
index 83356a04412772873e9941dddf46b79ecd687d6a..fc049e314f6fed4c586909a3b9256c597d5fe4be 100644 (file)
--- a/XOrg/proto/scrnsaverproto/Makefile
+++ b/XOrg/proto/scrnsaverproto/Makefile
@@ -26,7 +26,7 @@ define Package/scrnsaverproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/template.mk b/XOrg/proto/template.mk
index c470ca7bf6b9aadf2e670b11ce91963f28a256f4..ac5bb234c5014022d4aa72ca1409778b40060037 100644 (file)
--- a/XOrg/proto/template.mk
+++ b/XOrg/proto/template.mk
@@ -26,7 +26,7 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/trapproto/Makefile b/XOrg/proto/trapproto/Makefile
index 1de23faeaeb5f609113c740d8a31564240311cc6..82490ea924555d10e365d9b5f8f657febe68b086 100644 (file)
--- a/XOrg/proto/trapproto/Makefile
+++ b/XOrg/proto/trapproto/Makefile
@@ -26,7 +26,7 @@ define Package/trapproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/videoproto/Makefile b/XOrg/proto/videoproto/Makefile
index cd5b20a2449c4d6e49adaeeaebd50b4c70084506..1aa2710221ea22c8de622b4378080ea48b15be0a 100644 (file)
--- a/XOrg/proto/videoproto/Makefile
+++ b/XOrg/proto/videoproto/Makefile
@@ -26,7 +26,7 @@ define Package/videoproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/windowswmproto/Makefile b/XOrg/proto/windowswmproto/Makefile
index c3de8d44d103002b3105ed7d97bf2d1030c494e4..23e17329e4885ad568a5c85d85bf6a375431109f 100644 (file)
--- a/XOrg/proto/windowswmproto/Makefile
+++ b/XOrg/proto/windowswmproto/Makefile
@@ -26,7 +26,7 @@ define Package/windowswmproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xcmiscproto/Makefile b/XOrg/proto/xcmiscproto/Makefile
index 0b88e6b0618c61e3f976c139b482ced260abf2bc..c02c9354b57b62bf0e6a1378380d5e9bc63b2fef 100644 (file)
--- a/XOrg/proto/xcmiscproto/Makefile
+++ b/XOrg/proto/xcmiscproto/Makefile
@@ -26,7 +26,7 @@ define Package/xcmiscproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xextproto/Makefile b/XOrg/proto/xextproto/Makefile
index 7caff6df7da350510eb7e9902a4305d8c4699650..cc25d0377819604ec4b2c91c8e123fe3df5c8388 100644 (file)
--- a/XOrg/proto/xextproto/Makefile
+++ b/XOrg/proto/xextproto/Makefile
@@ -26,7 +26,7 @@ define Package/xextproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86bigfontproto/Makefile b/XOrg/proto/xf86bigfontproto/Makefile
index 91995bdd669a5bc61e5f4a0dca6ea16960a17f9d..1120dcd0277e03151f309654cf4777816b9cd971 100644 (file)
--- a/XOrg/proto/xf86bigfontproto/Makefile
+++ b/XOrg/proto/xf86bigfontproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86bigfontproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86dgaproto/Makefile b/XOrg/proto/xf86dgaproto/Makefile
index 1660343df092a5beb49f0c7cd64386f71dea3dad..c20c43cae575ea8fc7beb9a138aaf90a9be6734d 100644 (file)
--- a/XOrg/proto/xf86dgaproto/Makefile
+++ b/XOrg/proto/xf86dgaproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86dgaproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86driproto/Makefile b/XOrg/proto/xf86driproto/Makefile
index cda2f057e6864aae7d6070ecc29a094260fc5139..6b5c94e237bf2a1ea43dda9f1360c5e7464a641c 100644 (file)
--- a/XOrg/proto/xf86driproto/Makefile
+++ b/XOrg/proto/xf86driproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86driproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86miscproto/Makefile b/XOrg/proto/xf86miscproto/Makefile
index 181f39b7cca50725c36b337f34db331e4d2695c3..12335838c4d286a91bf2189f4be7b930892de7e8 100644 (file)
--- a/XOrg/proto/xf86miscproto/Makefile
+++ b/XOrg/proto/xf86miscproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86miscproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86rushproto/Makefile b/XOrg/proto/xf86rushproto/Makefile
index 47b76a6cdf10f48f2ff2580fd994de969bc2ba04..f380d4f996bc9c48c11585d0035b6a17a76fff80 100644 (file)
--- a/XOrg/proto/xf86rushproto/Makefile
+++ b/XOrg/proto/xf86rushproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86rushproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xf86vidmodeproto/Makefile b/XOrg/proto/xf86vidmodeproto/Makefile
index e9966b381300a3a48e14d458263b40122022c603..fd0a85e1dec1719d013a449fb020addfabad2877 100644 (file)
--- a/XOrg/proto/xf86vidmodeproto/Makefile
+++ b/XOrg/proto/xf86vidmodeproto/Makefile
@@ -26,7 +26,7 @@ define Package/xf86vidmodeproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xineramaproto/Makefile b/XOrg/proto/xineramaproto/Makefile
index 65d09377b9f20934d82badc93afa20e3b6c131db..44c7eca309ac3ea00ecd5f248930f5c234258bd9 100644 (file)
--- a/XOrg/proto/xineramaproto/Makefile
+++ b/XOrg/proto/xineramaproto/Makefile
@@ -26,7 +26,7 @@ define Package/xineramaproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xproto/Makefile b/XOrg/proto/xproto/Makefile
index 4109f9c7a86248297b6b97aaf8b578a2f1ef0e50..bfb0f45cd517f3d7d148ffc9e9a628a88270ea68 100644 (file)
--- a/XOrg/proto/xproto/Makefile
+++ b/XOrg/proto/xproto/Makefile
@@ -26,7 +26,7 @@ define Package/xproto
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/proto/xproxymanagementprotocol/Makefile b/XOrg/proto/xproxymanagementprotocol/Makefile
index 31219e256d29485251f44ff0379256f65643326f..d93878ef856bbf0d4a85d5d03fdc50601a857640 100644 (file)
--- a/XOrg/proto/xproxymanagementprotocol/Makefile
+++ b/XOrg/proto/xproxymanagementprotocol/Makefile
@@ -26,7 +26,7 @@ define Package/xproxymanagementprotocol
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Compile

diff --git a/XOrg/utils/template.mk b/XOrg/utils/template.mk
index c9735e5d99d949efc7fb50400f1e19f18d43923b..38cccf391e04707a462a6a86115d9dce86e170e4 100644 (file)
--- a/XOrg/utils/template.mk
+++ b/XOrg/utils/template.mk
@@ -26,7 +26,7 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
 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
 endef
 
 define Build/Configure

diff --git a/XOrg/utils/util-macros/Makefile b/XOrg/utils/util-macros/Makefile
index d11731c8a6e02d7176706b35593bad3a35691803..6e7a167ab6b5de1925de809a027bb6cdfde44ad6 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
 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
 endef
 
 define Build/Configure