summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-10-04 22:43:50 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-10-04 22:43:50 +0200
commit6a40f2f84bc5dd0b4664bef9e4f3309e21826ecb (patch)
treea48521727377850590785d548103edff19e43eac /packages
parentcac87aa1f4f11d7ad8e0200511703a95deccdbcd (diff)
downloadembtoolkit-6a40f2f84bc5dd0b4664bef9e4f3309e21826ecb.tar.gz
embtoolkit-6a40f2f84bc5dd0b4664bef9e4f3309e21826ecb.tar.bz2
embtoolkit-6a40f2f84bc5dd0b4664bef9e4f3309e21826ecb.tar.xz
Build system: replace PACKAGES_BUILD -> embtk_pkgb
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages')
-rw-r--r--packages/busybox/busybox.mk4
-rw-r--r--packages/compression/lzo/lzo.mk4
-rw-r--r--packages/compression/zlib/zlib.mk4
-rw-r--r--packages/database/sqlite/sqlite.mk4
-rw-r--r--packages/development/gdb/gdb.mk6
-rw-r--r--packages/development/libbsd/libbsd.mk4
-rw-r--r--packages/development/libevent/libevent.mk4
-rw-r--r--packages/development/libnih/libnih.mk4
-rw-r--r--packages/development/libsigsegv/libsigsegv.mk4
-rw-r--r--packages/graphics/atk/atk.mk4
-rw-r--r--packages/graphics/cairo/cairo.mk4
-rw-r--r--packages/graphics/directfb/directfb.mk4
-rw-r--r--packages/graphics/fontconfig/fontconfig.mk4
-rw-r--r--packages/graphics/freefont/freefont.mk4
-rw-r--r--packages/graphics/freetype/freetype.mk4
-rw-r--r--packages/graphics/gdk-pixbuf/gdk-pixbuf.mk4
-rw-r--r--packages/graphics/gtk/gtk.mk4
-rw-r--r--packages/graphics/imlib2/imlib2.mk4
-rw-r--r--packages/graphics/libjpeg/libjpeg.mk4
-rw-r--r--packages/graphics/libpng/libpng.mk4
-rw-r--r--packages/graphics/libtiff/libtiff.mk4
-rw-r--r--packages/graphics/pango/pango.mk4
-rw-r--r--packages/graphics/pixman/pixman.mk4
-rw-r--r--packages/misc/expat/expat.mk4
-rw-r--r--packages/misc/foo/foo-autotools.mk4
-rw-r--r--packages/misc/gettext/gettext.mk4
-rw-r--r--packages/misc/glib/glib.mk4
-rw-r--r--packages/misc/gperf/gperf.mk4
-rw-r--r--packages/misc/intltool/intltool.mk4
-rw-r--r--packages/misc/libelf/libelf.mk4
-rw-r--r--packages/misc/libxml/libxml.mk4
-rw-r--r--packages/misc/ncurses/ncurses.mk4
-rw-r--r--packages/misc/tslib/tslib.mk4
-rw-r--r--packages/net/iptables/iptables.mk4
-rw-r--r--packages/net/libnl/libnl.mk4
-rw-r--r--packages/scripting-languages/lua-modules/cgilua/cgilua.mk4
-rw-r--r--packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk4
-rw-r--r--packages/scripting-languages/lua-modules/rings/rings.mk4
-rw-r--r--packages/scripting-languages/lua/lua.mk4
-rw-r--r--packages/scripting-languages/perl/perl.mk6
-rw-r--r--packages/security/openssl/openssl.mk4
-rw-r--r--packages/system/dbus/dbus.mk4
-rw-r--r--packages/system/e2fsprogs/e2fsprogs.mk4
-rw-r--r--packages/system/upstart/upstart.mk4
-rw-r--r--packages/x11/bigreqsproto/bigreqsproto.mk4
-rw-r--r--packages/x11/compositeproto/compositeproto.mk4
-rw-r--r--packages/x11/damageproto/damageproto.mk4
-rw-r--r--packages/x11/fixesproto/fixesproto.mk4
-rw-r--r--packages/x11/fontsproto/fontsproto.mk4
-rw-r--r--packages/x11/inputproto/inputproto.mk4
-rw-r--r--packages/x11/kbproto/kbproto.mk4
-rw-r--r--packages/x11/libfontenc/libfontenc.mk4
-rw-r--r--packages/x11/libpciaccess/libpciaccess.mk4
-rw-r--r--packages/x11/libpthreadstubs/libpthreadstubs.mk4
-rw-r--r--packages/x11/libx11/libx11.mk4
-rw-r--r--packages/x11/libxau/libxau.mk4
-rw-r--r--packages/x11/libxcb/libxcb.mk4
-rw-r--r--packages/x11/libxcomposite/libxcomposite.mk4
-rw-r--r--packages/x11/libxext/libxext.mk4
-rw-r--r--packages/x11/libxfixes/libxfixes.mk4
-rw-r--r--packages/x11/libxfont/libxfont.mk4
-rw-r--r--packages/x11/libxft/libxft.mk4
-rw-r--r--packages/x11/libxi/libxi.mk4
-rw-r--r--packages/x11/libxkbfile/libxkbfile.mk4
-rw-r--r--packages/x11/libxrandr/libxrandr.mk4
-rw-r--r--packages/x11/libxrender/libxrender.mk4
-rw-r--r--packages/x11/randrproto/randrproto.mk4
-rw-r--r--packages/x11/recordproto/recordproto.mk4
-rw-r--r--packages/x11/renderproto/renderproto.mk4
-rw-r--r--packages/x11/resourceproto/resourceproto.mk4
-rw-r--r--packages/x11/utilmacros/utilmacros.mk4
-rw-r--r--packages/x11/videoproto/videoproto.mk4
-rw-r--r--packages/x11/xcbproto/xcbproto.mk4
-rw-r--r--packages/x11/xcbutil/xcbutil.mk4
-rw-r--r--packages/x11/xcmiscproto/xcmiscproto.mk4
-rw-r--r--packages/x11/xextproto/xextproto.mk4
-rw-r--r--packages/x11/xf86inputevdev/xf86inputevdev.mk4
-rw-r--r--packages/x11/xf86videofbdev/xf86videofbdev.mk4
-rw-r--r--packages/x11/xinput/xinput.mk4
-rw-r--r--packages/x11/xkbcomp/xkbcomp.mk4
-rw-r--r--packages/x11/xkeyboardconfig/xkeyboardconfig.mk4
-rw-r--r--packages/x11/xproto/xproto.mk4
-rw-r--r--packages/x11/xserver/xserver.mk4
-rw-r--r--packages/x11/xtrans/xtrans.mk4
84 files changed, 170 insertions, 170 deletions
diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk
index 34f3f64..a250ef1 100644
--- a/packages/busybox/busybox.mk
+++ b/packages/busybox/busybox.mk
@@ -28,8 +28,8 @@ BB_VERSION := $(call embtk_get_pkgversion,bb)
BB_SITE := http://www.busybox.net/downloads
BB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
BB_PACKAGE := busybox-$(BB_VERSION).tar.bz2
-BB_SRC_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION)
-BB_BUILD_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION)
+BB_SRC_DIR := $(embtk_pkgb)/busybox-$(BB_VERSION)
+BB_BUILD_DIR := $(embtk_pkgb)/busybox-$(BB_VERSION)
BB_NODESTDIR := y
BB_MAKE_ENV = CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing"
diff --git a/packages/compression/lzo/lzo.mk b/packages/compression/lzo/lzo.mk
index e7be409..d72fd1d 100644
--- a/packages/compression/lzo/lzo.mk
+++ b/packages/compression/lzo/lzo.mk
@@ -29,8 +29,8 @@ LZO_SITE := http://www.oberhumer.com/opensource/lzo/download
LZO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LZO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/lzo/$(LZO_VERSION)
LZO_PACKAGE := lzo-$(LZO_VERSION).tar.gz
-LZO_SRC_DIR := $(PACKAGES_BUILD)/lzo-$(LZO_VERSION)
-LZO_BUILD_DIR := $(PACKAGES_BUILD)/lzo-$(LZO_VERSION)
+LZO_SRC_DIR := $(embtk_pkgb)/lzo-$(LZO_VERSION)
+LZO_BUILD_DIR := $(embtk_pkgb)/lzo-$(LZO_VERSION)
LZO_BINS =
LZO_SBINS =
diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk
index 86a2279..7aa8f51 100644
--- a/packages/compression/zlib/zlib.mk
+++ b/packages/compression/zlib/zlib.mk
@@ -28,8 +28,8 @@ ZLIB_VERSION := $(call embtk_get_pkgversion,zlib)
ZLIB_SITE := http://zlib.net
ZLIB_MIRROR1 := http://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VERSION)
ZLIB_PACKAGE := zlib-$(ZLIB_VERSION).tar.bz2
-ZLIB_SRC_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION)
-ZLIB_BUILD_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION)
+ZLIB_SRC_DIR := $(embtk_pkgb)/zlib-$(ZLIB_VERSION)
+ZLIB_BUILD_DIR := $(embtk_pkgb)/zlib-$(ZLIB_VERSION)
ZLIB_BINS :=
diff --git a/packages/database/sqlite/sqlite.mk b/packages/database/sqlite/sqlite.mk
index 47ac0d2..94d2dd1 100644
--- a/packages/database/sqlite/sqlite.mk
+++ b/packages/database/sqlite/sqlite.mk
@@ -27,8 +27,8 @@ SQLITE_NAME := sqlite
SQLITE_VERSION := $(call embtk_get_pkgversion,sqlite)
SQLITE_SITE := http://www.sqlite.org
SQLITE_PACKAGE := sqlite-autoconf-$(SQLITE_VERSION).tar.gz
-SQLITE_SRC_DIR := $(PACKAGES_BUILD)/sqlite-autoconf-$(SQLITE_VERSION)
-SQLITE_BUILD_DIR := $(PACKAGES_BUILD)/sqlite-autoconf-$(SQLITE_VERSION)
+SQLITE_SRC_DIR := $(embtk_pkgb)/sqlite-autoconf-$(SQLITE_VERSION)
+SQLITE_BUILD_DIR := $(embtk_pkgb)/sqlite-autoconf-$(SQLITE_VERSION)
SQLITE_BINS := sqlite3
SQLITE_INCLUDES := sqlite3.h sqlite3ext.h
diff --git a/packages/development/gdb/gdb.mk b/packages/development/gdb/gdb.mk
index 8d969a7..e91bd16 100644
--- a/packages/development/gdb/gdb.mk
+++ b/packages/development/gdb/gdb.mk
@@ -27,10 +27,10 @@ GDB_NAME := gdb
GDB_VERSION := $(call embtk_get_pkgversion,gdb)
GDB_SITE := http://ftp.gnu.org/gnu/gdb
GDB_PACKAGE := gdb-$(GDB_VERSION).tar.bz2
-GDB_SRC_DIR := $(PACKAGES_BUILD)/gdb-$(GDB_VERSION)
+GDB_SRC_DIR := $(embtk_pkgb)/gdb-$(GDB_VERSION)
GDB_BUILD_DIR := $(if $(CONFIG_EMBTK_HAVE_GDBSERVER), \
- $(PACKAGES_BUILD)/gdb-$(GDB_VERSION)-serverbuild, \
- $(PACKAGES_BUILD)/gdb-$(GDB_VERSION)-build)
+ $(embtk_pkgb)/gdb-$(GDB_VERSION)-serverbuild, \
+ $(embtk_pkgb)/gdb-$(GDB_VERSION)-build)
# GDB installed files
GDBSERVER_BIN := $(if $(CONFIG_EMBTK_HAVE_GDBSERVER),,gdbserver)
diff --git a/packages/development/libbsd/libbsd.mk b/packages/development/libbsd/libbsd.mk
index d7dfd54..65bb621 100644
--- a/packages/development/libbsd/libbsd.mk
+++ b/packages/development/libbsd/libbsd.mk
@@ -27,8 +27,8 @@ LIBBSD_NAME := libbsd
LIBBSD_VERSION := $(call embtk_get_pkgversion,libbsd)
LIBBSD_SITE := http://libbsd.freedesktop.org/releases
LIBBSD_PACKAGE := libbsd-$(LIBBSD_VERSION).tar.gz
-LIBBSD_SRC_DIR := $(PACKAGES_BUILD)/libbsd-$(LIBBSD_VERSION)
-LIBBSD_BUILD_DIR := $(PACKAGES_BUILD)/libbsd-$(LIBBSD_VERSION)
+LIBBSD_SRC_DIR := $(embtk_pkgb)/libbsd-$(LIBBSD_VERSION)
+LIBBSD_BUILD_DIR := $(embtk_pkgb)/libbsd-$(LIBBSD_VERSION)
LIBBSD_INCLUDES := bsd
LIBBSD_LIBS := libbsd*
diff --git a/packages/development/libevent/libevent.mk b/packages/development/libevent/libevent.mk
index 5ee8ca3..8900d23 100644
--- a/packages/development/libevent/libevent.mk
+++ b/packages/development/libevent/libevent.mk
@@ -28,8 +28,8 @@ LIBEVENT_VERSION := $(call embtk_get_pkgversion,libevent)
LIBEVENT_SITE := http://www.monkey.org/~provos
LIBEVENT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBEVENT_PACKAGE := libevent-$(LIBEVENT_VERSION).tar.gz
-LIBEVENT_SRC_DIR := $(PACKAGES_BUILD)/libevent-$(LIBEVENT_VERSION)
-LIBEVENT_BUILD_DIR := $(PACKAGES_BUILD)/libevent-$(LIBEVENT_VERSION)
+LIBEVENT_SRC_DIR := $(embtk_pkgb)/libevent-$(LIBEVENT_VERSION)
+LIBEVENT_BUILD_DIR := $(embtk_pkgb)/libevent-$(LIBEVENT_VERSION)
LIBEVENT_BINS = event_rpcgen.py
LIBEVENT_SBINS =
diff --git a/packages/development/libnih/libnih.mk b/packages/development/libnih/libnih.mk
index cf22889..cadb73a 100644
--- a/packages/development/libnih/libnih.mk
+++ b/packages/development/libnih/libnih.mk
@@ -29,8 +29,8 @@ LIBNIH_MAJOR_VERSION := $(call embtk_get_pkgversion,libnih_major)
LIBNIH_SITE := http://launchpad.net/libnih/$(LIBNIH_MAJOR_VERSION)/$(LIBNIH_VERSION)/+download
LIBNIH_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBNIH_PACKAGE := libnih-$(LIBNIH_VERSION).tar.gz
-LIBNIH_SRC_DIR := $(PACKAGES_BUILD)/libnih-$(LIBNIH_VERSION)
-LIBNIH_BUILD_DIR := $(PACKAGES_BUILD)/libnih-$(LIBNIH_VERSION)
+LIBNIH_SRC_DIR := $(embtk_pkgb)/libnih-$(LIBNIH_VERSION)
+LIBNIH_BUILD_DIR := $(embtk_pkgb)/libnih-$(LIBNIH_VERSION)
LIBNIH_BINS = nih-dbus-tool
LIBNIH_SBINS =
diff --git a/packages/development/libsigsegv/libsigsegv.mk b/packages/development/libsigsegv/libsigsegv.mk
index aa80236..ee5124b 100644
--- a/packages/development/libsigsegv/libsigsegv.mk
+++ b/packages/development/libsigsegv/libsigsegv.mk
@@ -29,8 +29,8 @@ LIBSIGSEGV_SITE := ftp://ftp.gnu.org/pub/gnu/libsigsegv
LIBSIGSEGV_SITE_MIRROR1 := http://ftp.gnu.org/gnu/libsigsegv
LIBSIGSEGV_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBSIGSEGV_PACKAGE := libsigsegv-$(LIBSIGSEGV_VERSION).tar.gz
-LIBSIGSEGV_SRC_DIR := $(PACKAGES_BUILD)/libsigsegv-$(LIBSIGSEGV_VERSION)
-LIBSIGSEGV_BUILD_DIR := $(PACKAGES_BUILD)/libsigsegv-$(LIBSIGSEGV_VERSION)
+LIBSIGSEGV_SRC_DIR := $(embtk_pkgb)/libsigsegv-$(LIBSIGSEGV_VERSION)
+LIBSIGSEGV_BUILD_DIR := $(embtk_pkgb)/libsigsegv-$(LIBSIGSEGV_VERSION)
LIBSIGSEGV_BINS =
LIBSIGSEGV_SBINS =
diff --git a/packages/graphics/atk/atk.mk b/packages/graphics/atk/atk.mk
index c05ed41..6cdba19 100644
--- a/packages/graphics/atk/atk.mk
+++ b/packages/graphics/atk/atk.mk
@@ -29,8 +29,8 @@ ATK_MAJOR_VERSION := $(call embtk_get_pkgversion,atk_major)
ATK_SITE := http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_MAJOR_VERSION)
ATK_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
ATK_PACKAGE := atk-$(ATK_VERSION).tar.bz2
-ATK_SRC_DIR := $(PACKAGES_BUILD)/atk-$(ATK_VERSION)
-ATK_BUILD_DIR := $(PACKAGES_BUILD)/atk-$(ATK_VERSION)
+ATK_SRC_DIR := $(embtk_pkgb)/atk-$(ATK_VERSION)
+ATK_BUILD_DIR := $(embtk_pkgb)/atk-$(ATK_VERSION)
ATK_BINS =
ATK_SBINS =
diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk
index 37387ce..19e0485 100644
--- a/packages/graphics/cairo/cairo.mk
+++ b/packages/graphics/cairo/cairo.mk
@@ -28,8 +28,8 @@ CAIRO_VERSION := $(call embtk_get_pkgversion,cairo)
CAIRO_SITE := http://www.cairographics.org/releases
CAIRO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
CAIRO_PACKAGE := cairo-$(CAIRO_VERSION).tar.gz
-CAIRO_SRC_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION)
-CAIRO_BUILD_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION)
+CAIRO_SRC_DIR := $(embtk_pkgb)/cairo-$(CAIRO_VERSION)
+CAIRO_BUILD_DIR := $(embtk_pkgb)/cairo-$(CAIRO_VERSION)
CAIRO_BINS =
CAIRO_SBINS =
diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk
index 0cfb78f..64f60ae 100644
--- a/packages/graphics/directfb/directfb.mk
+++ b/packages/graphics/directfb/directfb.mk
@@ -28,8 +28,8 @@ DIRECTFB_VERSION := $(call embtk_get_pkgversion,directfb)
DIRECTFB_BRANCH := $(call embtk_get_pkgversion,directfb_branch)
DIRECTFB_SITE := http://www.directfb.org/downloads/Core/$(DIRECTFB_BRANCH)
DIRECTFB_PACKAGE := DirectFB-$(DIRECTFB_VERSION).tar.gz
-DIRECTFB_SRC_DIR := $(PACKAGES_BUILD)/DirectFB-$(DIRECTFB_VERSION)
-DIRECTFB_BUILD_DIR := $(PACKAGES_BUILD)/DirectFB-$(DIRECTFB_VERSION)
+DIRECTFB_SRC_DIR := $(embtk_pkgb)/DirectFB-$(DIRECTFB_VERSION)
+DIRECTFB_BUILD_DIR := $(embtk_pkgb)/DirectFB-$(DIRECTFB_VERSION)
DIRECTFB_BINS = c64xdump dfbfx dfbinfo dfbinspector dfbmaster \
dfbscreen directfb-csource mkdgiff dfbdump dfbg \
diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk
index 4a79742..a29c461 100644
--- a/packages/graphics/fontconfig/fontconfig.mk
+++ b/packages/graphics/fontconfig/fontconfig.mk
@@ -28,8 +28,8 @@ FONTCONFIG_VERSION := $(call embtk_get_pkgversion,fontconfig)
FONTCONFIG_SITE := http://fontconfig.org/release
FONTCONFIG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
FONTCONFIG_PACKAGE := fontconfig-$(FONTCONFIG_VERSION).tar.gz
-FONTCONFIG_SRC_DIR := $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION)
-FONTCONFIG_BUILD_DIR := $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION)
+FONTCONFIG_SRC_DIR := $(embtk_pkgb)/fontconfig-$(FONTCONFIG_VERSION)
+FONTCONFIG_BUILD_DIR := $(embtk_pkgb)/fontconfig-$(FONTCONFIG_VERSION)
FONTCONFIG_BINS = fc-cache fc-cat fc-list fc-match fc-query fc-scan
FONTCONFIG_SBINS =
diff --git a/packages/graphics/freefont/freefont.mk b/packages/graphics/freefont/freefont.mk
index 30e3583..fb6aea6 100644
--- a/packages/graphics/freefont/freefont.mk
+++ b/packages/graphics/freefont/freefont.mk
@@ -27,8 +27,8 @@ FREEFONT_TTF_NAME := freefont-ttf
FREEFONT_TTF_SITE := http://ftp.gnu.org/gnu/freefont
FREEFONT_TTF_VERSION := $(call embtk_get_pkgversion,freefont_ttf)
FREEFONT_TTF_PACKAGE := freefont-ttf-$(FREEFONT_TTF_VERSION).tar.gz
-FREEFONT_TTF_SRC_DIR := $(PACKAGES_BUILD)/freefont-$(FREEFONT_TTF_VERSION)
-FREEFONT_TTF_BUILD_DIR := $(PACKAGES_BUILD)/freefont-$(FREEFONT_TTF_VERSION)
+FREEFONT_TTF_SRC_DIR := $(embtk_pkgb)/freefont-$(FREEFONT_TTF_VERSION)
+FREEFONT_TTF_BUILD_DIR := $(embtk_pkgb)/freefont-$(FREEFONT_TTF_VERSION)
FREEFONT_TTF_DEPS := freetype_install
FREEFONT_TTF_DEPS += download_freefont_ttf
diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index 9aed9b1..f3af3a6 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -28,8 +28,8 @@ FREETYPE_VERSION := $(call embtk_get_pkgversion,freetype)
FREETYPE_SITE := http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
FREETYPE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
FREETYPE_PACKAGE := freetype-$(FREETYPE_VERSION).tar.bz2
-FREETYPE_SRC_DIR := $(PACKAGES_BUILD)/freetype-$(FREETYPE_VERSION)
-FREETYPE_BUILD_DIR := $(PACKAGES_BUILD)/freetype-$(FREETYPE_VERSION)
+FREETYPE_SRC_DIR := $(embtk_pkgb)/freetype-$(FREETYPE_VERSION)
+FREETYPE_BUILD_DIR := $(embtk_pkgb)/freetype-$(FREETYPE_VERSION)
FREETYPE_BINS = freetype*
FREETYPE_SBINS =
diff --git a/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk b/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk
index 9b722df..7f12299 100644
--- a/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk
+++ b/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk
@@ -29,8 +29,8 @@ GDKPIXBUF_VERSION := $(call embtk_get_pkgversion,gdkpixbuf)
GDKPIXBUF_SITE := http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/$(GDKPIXBUF_MAJOR_VERSION)
GDKPIXBUF_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
GDKPIXBUF_PACKAGE := gdk-pixbuf-$(GDKPIXBUF_VERSION).tar.bz2
-GDKPIXBUF_SRC_DIR := $(PACKAGES_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION)
-GDKPIXBUF_BUILD_DIR := $(PACKAGES_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION)
+GDKPIXBUF_SRC_DIR := $(embtk_pkgb)/gdk-pixbuf-$(GDKPIXBUF_VERSION)
+GDKPIXBUF_BUILD_DIR := $(embtk_pkgb)/gdk-pixbuf-$(GDKPIXBUF_VERSION)
GDKPIXBUF_BINS :=
GDKPIXBUF_SBINS :=
diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk
index 74da271..cc81b79 100644
--- a/packages/graphics/gtk/gtk.mk
+++ b/packages/graphics/gtk/gtk.mk
@@ -29,8 +29,8 @@ GTK_VERSION := $(call embtk_get_pkgversion,gtk)
GTK_SITE := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(GTK_MAJOR_VERSION)
GTK_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
GTK_PACKAGE := gtk+-$(GTK_VERSION).tar.bz2
-GTK_SRC_DIR := $(PACKAGES_BUILD)/gtk+-$(GTK_VERSION)
-GTK_BUILD_DIR := $(PACKAGES_BUILD)/gtk+-$(GTK_VERSION)
+GTK_SRC_DIR := $(embtk_pkgb)/gtk+-$(GTK_VERSION)
+GTK_BUILD_DIR := $(embtk_pkgb)/gtk+-$(GTK_VERSION)
GTK_BINS = gtk-* gdk-*
GTK_SBINS =
diff --git a/packages/graphics/imlib2/imlib2.mk b/packages/graphics/imlib2/imlib2.mk
index 2bb3b44..fcd7570 100644
--- a/packages/graphics/imlib2/imlib2.mk
+++ b/packages/graphics/imlib2/imlib2.mk
@@ -28,8 +28,8 @@ IMLIB2_VERSION := $(call embtk_get_pkgversion,imlib2)
IMLIB2_SITE := http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)
IMLIB2_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
IMLIB2_PACKAGE := imlib2-$(IMLIB2_VERSION).tar.gz
-IMLIB2_SRC_DIR := $(PACKAGES_BUILD)/imlib2-$(IMLIB2_VERSION)
-IMLIB2_BUILD_DIR := $(PACKAGES_BUILD)/imlib2-$(IMLIB2_VERSION)
+IMLIB2_SRC_DIR := $(embtk_pkgb)/imlib2-$(IMLIB2_VERSION)
+IMLIB2_BUILD_DIR := $(embtk_pkgb)/imlib2-$(IMLIB2_VERSION)
IMLIB2_BINS = imlib2_bumpmap imlib2_colorspace imlib2-config \
imlib2_conv imlib2_grab imlib2_poly imlib2_show \
diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk
index cc5f48c..6194e81 100644
--- a/packages/graphics/libjpeg/libjpeg.mk
+++ b/packages/graphics/libjpeg/libjpeg.mk
@@ -28,8 +28,8 @@ LIBJPEG_VERSION := $(call embtk_get_pkgversion,libjpeg)
LIBJPEG_SITE := http://www.ijg.org/files
LIBJPEG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBJPEG_PACKAGE := jpegsrc.v$(LIBJPEG_VERSION).tar.gz
-LIBJPEG_SRC_DIR := $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION)
-LIBJPEG_BUILD_DIR := $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION)
+LIBJPEG_SRC_DIR := $(embtk_pkgb)/jpeg-$(LIBJPEG_VERSION)
+LIBJPEG_BUILD_DIR := $(embtk_pkgb)/jpeg-$(LIBJPEG_VERSION)
LIBJPEG_BINS := cjpeg djpeg jpegtran rdjpgcom wrjpgcom
LIBJPEG_SBINS :=
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk
index f8654c1..bd76282 100644
--- a/packages/graphics/libpng/libpng.mk
+++ b/packages/graphics/libpng/libpng.mk
@@ -27,8 +27,8 @@ LIBPNG_NAME := libpng
LIBPNG_VERSION := $(call embtk_get_pkgversion,libpng)
LIBPNG_SITE := http://download.sourceforge.net/libpng
LIBPNG_PACKAGE := libpng-$(LIBPNG_VERSION).tar.xz
-LIBPNG_SRC_DIR := $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
-LIBPNG_BUILD_DIR := $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
+LIBPNG_SRC_DIR := $(embtk_pkgb)/libpng-$(LIBPNG_VERSION)
+LIBPNG_BUILD_DIR := $(embtk_pkgb)/libpng-$(LIBPNG_VERSION)
LIBPNG_BINS = libpng*
LIBPNG_SBINS =
diff --git a/packages/graphics/libtiff/libtiff.mk b/packages/graphics/libtiff/libtiff.mk
index 1bfd626..62aa2e3 100644
--- a/packages/graphics/libtiff/libtiff.mk
+++ b/packages/graphics/libtiff/libtiff.mk
@@ -28,8 +28,8 @@ LIBTIFF_VERSION := $(call embtk_get_pkgversion,libtiff)
LIBTIFF_SITE := ftp://ftp.remotesensing.org/pub/libtiff
LIBTIFF_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBTIFF_PACKAGE := tiff-$(LIBTIFF_VERSION).tar.gz
-LIBTIFF_SRC_DIR := $(PACKAGES_BUILD)/tiff-$(LIBTIFF_VERSION)
-LIBTIFF_BUILD_DIR := $(PACKAGES_BUILD)/tiff-$(LIBTIFF_VERSION)
+LIBTIFF_SRC_DIR := $(embtk_pkgb)/tiff-$(LIBTIFF_VERSION)
+LIBTIFF_BUILD_DIR := $(embtk_pkgb)/tiff-$(LIBTIFF_VERSION)
LIBTIFF_BINS = vbmp2tiff fax2tiff pal2rgb ras2tiff rgb2ycbcr tiff2bw tiff2ps \
tiffcmp tiffcrop tiffdump tiffmedian tiffsplit fax2ps gif2tiff \
diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk
index 51b5a9a..b7e44cb 100644
--- a/packages/graphics/pango/pango.mk
+++ b/packages/graphics/pango/pango.mk
@@ -29,8 +29,8 @@ PANGO_VERSION := $(call embtk_get_pkgversion,pango)
PANGO_SITE := http://ftp.gnome.org/pub/gnome/sources/pango/$(PANGO_MAJOR_VERSION)
PANGO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
PANGO_PACKAGE := pango-$(PANGO_VERSION).tar.bz2
-PANGO_SRC_DIR := $(PACKAGES_BUILD)/pango-$(PANGO_VERSION)
-PANGO_BUILD_DIR := $(PACKAGES_BUILD)/pango-$(PANGO_VERSION)
+PANGO_SRC_DIR := $(embtk_pkgb)/pango-$(PANGO_VERSION)
+PANGO_BUILD_DIR := $(embtk_pkgb)/pango-$(PANGO_VERSION)
PANGO_BINS = pango*
PANGO_SBINS =
diff --git a/packages/graphics/pixman/pixman.mk b/packages/graphics/pixman/pixman.mk
index 8f4d1f1..9e521f8 100644
--- a/packages/graphics/pixman/pixman.mk
+++ b/packages/graphics/pixman/pixman.mk
@@ -28,8 +28,8 @@ PIXMAN_VERSION := $(call embtk_get_pkgversion,pixman)
PIXMAN_SITE := http://www.cairographics.org/releases
PIXMAN_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
PIXMAN_PACKAGE := pixman-$(PIXMAN_VERSION).tar.gz
-PIXMAN_SRC_DIR := $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION)
-PIXMAN_BUILD_DIR := $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION)
+PIXMAN_SRC_DIR := $(embtk_pkgb)/pixman-$(PIXMAN_VERSION)
+PIXMAN_BUILD_DIR := $(embtk_pkgb)/pixman-$(PIXMAN_VERSION)
PIXMAN_BINS =
PIXMAN_SBINS =
diff --git a/packages/misc/expat/expat.mk b/packages/misc/expat/expat.mk
index ecbe098..84d1872 100644
--- a/packages/misc/expat/expat.mk
+++ b/packages/misc/expat/expat.mk
@@ -28,8 +28,8 @@ EXPAT_VERSION := $(call embtk_get_pkgversion,expat)
EXPAT_SITE := http://downloads.sourceforge.net/expat
EXPAT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
EXPAT_PACKAGE := expat-$(EXPAT_VERSION).tar.gz
-EXPAT_SRC_DIR := $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
-EXPAT_BUILD_DIR := $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
+EXPAT_SRC_DIR := $(embtk_pkgb)/expat-$(EXPAT_VERSION)
+EXPAT_BUILD_DIR := $(embtk_pkgb)/expat-$(EXPAT_VERSION)
EXPAT_BINS = xmlwf
EXPAT_SBINS =
diff --git a/packages/misc/foo/foo-autotools.mk b/packages/misc/foo/foo-autotools.mk
index 14a9888..67611da 100644
--- a/packages/misc/foo/foo-autotools.mk
+++ b/packages/misc/foo/foo-autotools.mk
@@ -27,8 +27,8 @@ FOO_NAME := foo
FOO_VERSION := $(call embtk_get_pkgversion,foo)
FOO_SITE := http://www.foo.org/download
FOO_PACKAGE := foo-$(FOO_VERSION).tar.gz
-FOO_SRC_DIR := $(PACKAGES_BUILD)/foo-$(FOO_VERSION)
-FOO_BUILD_DIR := $(PACKAGES_BUILD)/foo-$(FOO_VERSION)
+FOO_SRC_DIR := $(embtk_pkgb)/foo-$(FOO_VERSION)
+FOO_BUILD_DIR := $(embtk_pkgb)/foo-$(FOO_VERSION)
FOO_BINS :=
FOO_SBINS :=
diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk
index ae681c1..2b7f973 100644
--- a/packages/misc/gettext/gettext.mk
+++ b/packages/misc/gettext/gettext.mk
@@ -28,8 +28,8 @@ GETTEXT_VERSION := $(call embtk_get_pkgversion,gettext)
GETTEXT_SITE := http://ftp.gnu.org/pub/gnu/gettext
GETTEXT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
GETTEXT_PACKAGE := gettext-$(GETTEXT_VERSION).tar.gz
-GETTEXT_SRC_DIR := $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
-GETTEXT_BUILD_DIR := $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
+GETTEXT_SRC_DIR := $(embtk_pkgb)/gettext-$(GETTEXT_VERSION)
+GETTEXT_BUILD_DIR := $(embtk_pkgb)/gettext-$(GETTEXT_VERSION)
# gettext for target
GETTEXT_BINS = autopoint gettext gettext.sh msgcat msgcomm msgen \
diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk
index 76224b9..522d0a5 100644
--- a/packages/misc/glib/glib.mk
+++ b/packages/misc/glib/glib.mk
@@ -30,8 +30,8 @@ GLIB_SITE := http://ftp.gnome.org/pub/gnome/sources/glib/$(GLIB_MAJOR_VERSION)
GLIB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
GLIB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/glib/$(GLIB_VERSION)
GLIB_PACKAGE := glib-$(GLIB_VERSION).tar.bz2
-GLIB_SRC_DIR := $(PACKAGES_BUILD)/glib-$(GLIB_VERSION)
-GLIB_BUILD_DIR := $(PACKAGES_BUILD)/glib-$(GLIB_VERSION)
+GLIB_SRC_DIR := $(embtk_pkgb)/glib-$(GLIB_VERSION)
+GLIB_BUILD_DIR := $(embtk_pkgb)/glib-$(GLIB_VERSION)
GLIB_BINS = glib-genmarshal glib-gettextize glib-mkenums \
gobject-query gtester gtester-report
diff --git a/packages/misc/gperf/gperf.mk b/packages/misc/gperf/gperf.mk
index cfbbf74..7a59ed8 100644
--- a/packages/misc/gperf/gperf.mk
+++ b/packages/misc/gperf/gperf.mk
@@ -28,8 +28,8 @@ GPERF_VERSION := $(call embtk_get_pkgversion,gperf)
GPERF_SITE := http://ftp.gnu.org/gnu/gperf
GPERF_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
GPERF_PACKAGE := gperf-$(GPERF_VERSION).tar.gz
-GPERF_SRC_DIR := $(PACKAGES_BUILD)/gperf-$(GPERF_VERSION)
-GPERF_BUILD_DIR := $(PACKAGES_BUILD)/gperf-$(GPERF_VERSION)
+GPERF_SRC_DIR := $(embtk_pkgb)/gperf-$(GPERF_VERSION)
+GPERF_BUILD_DIR := $(embtk_pkgb)/gperf-$(GPERF_VERSION)
#
# gperf for target
diff --git a/packages/misc/intltool/intltool.mk b/packages/misc/intltool/intltool.mk
index 8453544..10a315f 100644
--- a/packages/misc/intltool/intltool.mk
+++ b/packages/misc/intltool/intltool.mk
@@ -29,8 +29,8 @@ INTLTOOL_VERSION := $(call embtk_get_pkgversion,intltool)
INTLTOOL_SITE := http://ftp.gnome.org/pub/gnome/sources/intltool/$(INTLTOOL_MAJOR_VERSION)
INTLTOOL_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
INTLTOOL_PACKAGE := intltool-$(INTLTOOL_VERSION).tar.bz2
-INTLTOOL_SRC_DIR := $(PACKAGES_BUILD)/intltool-$(INTLTOOL_VERSION)
-INTLTOOL_BUILD_DIR := $(PACKAGES_BUILD)/intltool-$(INTLTOOL_VERSION)
+INTLTOOL_SRC_DIR := $(embtk_pkgb)/intltool-$(INTLTOOL_VERSION)
+INTLTOOL_BUILD_DIR := $(embtk_pkgb)/intltool-$(INTLTOOL_VERSION)
#
# intltool for target
diff --git a/packages/misc/libelf/libelf.mk b/packages/misc/libelf/libelf.mk
index 52a7d7b..71f25e9 100644
--- a/packages/misc/libelf/libelf.mk
+++ b/packages/misc/libelf/libelf.mk
@@ -27,8 +27,8 @@ LIBELF_NAME := libelf
LIBELF_VERSION := $(call embtk_get_pkgversion,libelf)
LIBELF_SITE := http://www.mr511.de/software
LIBELF_PACKAGE := libelf-$(LIBELF_VERSION).tar.gz
-LIBELF_SRC_DIR := $(PACKAGES_BUILD)/libelf-$(LIBELF_VERSION)
-LIBELF_BUILD_DIR := $(PACKAGES_BUILD)/libelf-$(LIBELF_VERSION)
+LIBELF_SRC_DIR := $(embtk_pkgb)/libelf-$(LIBELF_VERSION)
+LIBELF_BUILD_DIR := $(embtk_pkgb)/libelf-$(LIBELF_VERSION)
LIBELF_BINS :=
LIBELF_SBINS :=
diff --git a/packages/misc/libxml/libxml.mk b/packages/misc/libxml/libxml.mk
index 640ab15..fee121f 100644
--- a/packages/misc/libxml/libxml.mk
+++ b/packages/misc/libxml/libxml.mk
@@ -28,8 +28,8 @@ LIBXML2_VERSION := $(call embtk_get_pkgversion,libxml2)
LIBXML2_SITE := ftp://xmlsoft.org/libxml2
LIBXML2_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXML2_PACKAGE := libxml2-$(LIBXML2_VERSION).tar.gz
-LIBXML2_SRC_DIR := $(PACKAGES_BUILD)/libxml2-$(LIBXML2_VERSION)
-LIBXML2_BUILD_DIR := $(PACKAGES_BUILD)/libxml2-$(LIBXML2_VERSION)
+LIBXML2_SRC_DIR := $(embtk_pkgb)/libxml2-$(LIBXML2_VERSION)
+LIBXML2_BUILD_DIR := $(embtk_pkgb)/libxml2-$(LIBXML2_VERSION)
LIBXML2_BINS = xml2-config xmlcatalog xmllint
LIBXML2_SBINS =
diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk
index e6e4a54..806e023 100644
--- a/packages/misc/ncurses/ncurses.mk
+++ b/packages/misc/ncurses/ncurses.mk
@@ -28,8 +28,8 @@ NCURSES_VERSION := $(call embtk_get_pkgversion,ncurses)
NCURSES_SITE := http://ftp.gnu.org/pub/gnu/ncurses
NCURSES_PACKAGE := ncurses-$(NCURSES_VERSION).tar.gz
NCURSES_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-NCURSES_SRC_DIR := $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
-NCURSES_BUILD_DIR := $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
+NCURSES_SRC_DIR := $(embtk_pkgb)/ncurses-$(NCURSES_VERSION)
+NCURSES_BUILD_DIR := $(embtk_pkgb)/ncurses-$(NCURSES_VERSION)
NCURSES_BINS = captoinfo clear infocmp infotocap ncurses5-config reset tic toe \
tput tset
diff --git a/packages/misc/tslib/tslib.mk b/packages/misc/tslib/tslib.mk
index 6b43057..9c25826 100644
--- a/packages/misc/tslib/tslib.mk
+++ b/packages/misc/tslib/tslib.mk
@@ -28,8 +28,8 @@ TSLIB_VERSION := $(call embtk_get_pkgversion,tslib)
TSLIB_SITE := http://download.berlios.de/tslib
TSLIB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
TSLIB_PACKAGE := tslib-$(TSLIB_VERSION).tar.bz2
-TSLIB_SRC_DIR := $(PACKAGES_BUILD)/tslib-$(TSLIB_VERSION)
-TSLIB_BUILD_DIR := $(PACKAGES_BUILD)/tslib-$(TSLIB_VERSION)
+TSLIB_SRC_DIR := $(embtk_pkgb)/tslib-$(TSLIB_VERSION)
+TSLIB_BUILD_DIR := $(embtk_pkgb)/tslib-$(TSLIB_VERSION)
TSLIB_BINS = ts_calibrate ts_harvest ts_print ts_print_raw ts_test
TSLIB_SBINS =
diff --git a/packages/net/iptables/iptables.mk b/packages/net/iptables/iptables.mk
index e42523d..4eec24d 100644
--- a/packages/net/iptables/iptables.mk
+++ b/packages/net/iptables/iptables.mk
@@ -27,8 +27,8 @@ IPTABLES_NAME := iptables
IPTABLES_VERSION := $(call embtk_get_pkgversion,iptables)
IPTABLES_SITE := ftp://ftp.netfilter.org/pub/iptables
IPTABLES_PACKAGE := iptables-$(IPTABLES_VERSION).tar.bz2
-IPTABLES_SRC_DIR := $(PACKAGES_BUILD)/iptables-$(IPTABLES_VERSION)
-IPTABLES_BUILD_DIR := $(PACKAGES_BUILD)/iptables-$(IPTABLES_VERSION)
+IPTABLES_SRC_DIR := $(embtk_pkgb)/iptables-$(IPTABLES_VERSION)
+IPTABLES_BUILD_DIR := $(embtk_pkgb)/iptables-$(IPTABLES_VERSION)
IPTABLES_SBINS := iptables ip6tables ip6tables-restore ip6tables-save
IPTABLES_SBINS += iptables-restore iptables-save
diff --git a/packages/net/libnl/libnl.mk b/packages/net/libnl/libnl.mk
index f8dd1c5..fdfacb5 100644
--- a/packages/net/libnl/libnl.mk
+++ b/packages/net/libnl/libnl.mk
@@ -27,8 +27,8 @@ LIBNL_NAME := libnl
LIBNL_VERSION := $(call embtk_get_pkgversion,libnl)
LIBNL_SITE := http://www.infradead.org/~tgr/libnl/files
LIBNL_PACKAGE := libnl-$(LIBNL_VERSION).tar.gz
-LIBNL_SRC_DIR := $(PACKAGES_BUILD)/libnl-$(LIBNL_VERSION)
-LIBNL_BUILD_DIR := $(PACKAGES_BUILD)/libnl-$(LIBNL_VERSION)
+LIBNL_SRC_DIR := $(embtk_pkgb)/libnl-$(LIBNL_VERSION)
+LIBNL_BUILD_DIR := $(embtk_pkgb)/libnl-$(LIBNL_VERSION)
LIBNL_SBINS := genl-ctrl-list nl-class-add nl-class-delete
LIBNL_SBINS += nl-classid-lookup nl-class-list nl-cls-add
diff --git a/packages/scripting-languages/lua-modules/cgilua/cgilua.mk b/packages/scripting-languages/lua-modules/cgilua/cgilua.mk
index 70393c4..35f2915 100644
--- a/packages/scripting-languages/lua-modules/cgilua/cgilua.mk
+++ b/packages/scripting-languages/lua-modules/cgilua/cgilua.mk
@@ -27,8 +27,8 @@ CGILUA_NAME := cgilua
CGILUA_VERSION := $(call embtk_get_pkgversion,cgilua)
CGILUA_SITE := https://github.com/downloads/keplerproject/cgilua
CGILUA_PACKAGE := cgilua-$(CGILUA_VERSION).tar.gz
-CGILUA_SRC_DIR := $(PACKAGES_BUILD)/cgilua-$(CGILUA_VERSION)
-CGILUA_BUILD_DIR := $(PACKAGES_BUILD)/cgilua-$(CGILUA_VERSION)
+CGILUA_SRC_DIR := $(embtk_pkgb)/cgilua-$(CGILUA_VERSION)
+CGILUA_BUILD_DIR := $(embtk_pkgb)/cgilua-$(CGILUA_VERSION)
CGILUA_LIBS =
diff --git a/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk b/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk
index c8caa29..b9c4d28 100644
--- a/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk
+++ b/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk
@@ -27,8 +27,8 @@ LUAFILESYSTEM_NAME := luafilesystem
LUAFILESYSTEM_VERSION := $(call embtk_get_pkgversion,luafilesystem)
LUAFILESYSTEM_SITE := https://github.com/downloads/keplerproject/luafilesystem
LUAFILESYSTEM_PACKAGE := luafilesystem-$(LUAFILESYSTEM_VERSION).tar.gz
-LUAFILESYSTEM_SRC_DIR := $(PACKAGES_BUILD)/luafilesystem-$(LUAFILESYSTEM_VERSION)
-LUAFILESYSTEM_BUILD_DIR := $(PACKAGES_BUILD)/luafilesystem-$(LUAFILESYSTEM_VERSION)
+LUAFILESYSTEM_SRC_DIR := $(embtk_pkgb)/luafilesystem-$(LUAFILESYSTEM_VERSION)
+LUAFILESYSTEM_BUILD_DIR := $(embtk_pkgb)/luafilesystem-$(LUAFILESYSTEM_VERSION)
LUAFILESYSTEM_LIBS =
diff --git a/packages/scripting-languages/lua-modules/rings/rings.mk b/packages/scripting-languages/lua-modules/rings/rings.mk
index cbb1170..6b3d5b1 100644
--- a/packages/scripting-languages/lua-modules/rings/rings.mk
+++ b/packages/scripting-languages/lua-modules/rings/rings.mk
@@ -27,8 +27,8 @@ RINGS_NAME := rings
RINGS_VERSION := $(call embtk_get_pkgversion,rings)
RINGS_SITE := https://github.com/downloads/keplerproject/rings
RINGS_PACKAGE := rings-$(RINGS_VERSION).tar.gz
-RINGS_SRC_DIR := $(PACKAGES_BUILD)/rings-$(RINGS_VERSION)
-RINGS_BUILD_DIR := $(PACKAGES_BUILD)/rings-$(RINGS_VERSION)
+RINGS_SRC_DIR := $(embtk_pkgb)/rings-$(RINGS_VERSION)
+RINGS_BUILD_DIR := $(embtk_pkgb)/rings-$(RINGS_VERSION)
RINGS_LIBS =
diff --git a/packages/scripting-languages/lua/lua.mk b/packages/scripting-languages/lua/lua.mk
index 5d1fcf2..5d1d2f5 100644
--- a/packages/scripting-languages/lua/lua.mk
+++ b/packages/scripting-languages/lua/lua.mk
@@ -27,8 +27,8 @@ LUA_NAME := lua
LUA_VERSION := $(call embtk_get_pkgversion,lua)
LUA_SITE := http://www.lua.org/ftp
LUA_PACKAGE := lua-$(LUA_VERSION).tar.gz
-LUA_SRC_DIR := $(PACKAGES_BUILD)/lua-$(LUA_VERSION)
-LUA_BUILD_DIR := $(PACKAGES_BUILD)/lua-$(LUA_VERSION)
+LUA_SRC_DIR := $(embtk_pkgb)/lua-$(LUA_VERSION)
+LUA_BUILD_DIR := $(embtk_pkgb)/lua-$(LUA_VERSION)
LUA_BINS = lua luac
LUA_SBINS =
diff --git a/packages/scripting-languages/perl/perl.mk b/packages/scripting-languages/perl/perl.mk
index 8c49b34..00ade78 100644
--- a/packages/scripting-languages/perl/perl.mk
+++ b/packages/scripting-languages/perl/perl.mk
@@ -26,8 +26,8 @@ PERL_NAME := perl
PERL_VERSION := $(call embtk_get_pkgversion,perl)
PERL_SITE := http://www.cpan.org/src
PERL_PACKAGE := perl-$(PERL_VERSION).tar.gz
-PERL_SRC_DIR := $(PACKAGES_BUILD)/perl-$(PERL_VERSION)
-PERL_BUILD_DIR := $(PACKAGES_BUILD)/perl-$(PERL_VERSION)
+PERL_SRC_DIR := $(embtk_pkgb)/perl-$(PERL_VERSION)
+PERL_BUILD_DIR := $(embtk_pkgb)/perl-$(PERL_VERSION)
#
@@ -38,7 +38,7 @@ MICROPERL_VERSION := $(PERL_VERSION)
MICROPERL_SITE := $(PERL_SITE)
MICROPERL_PACKAGE := $(PERL_PACKAGE)
MICROPERL_SRC_DIR := $(PERL_SRC_DIR)
-MICROPERL_BUILD_DIR := $(PACKAGES_BUILD)/perl-$(PERL_VERSION)
+MICROPERL_BUILD_DIR := $(embtk_pkgb)/perl-$(PERL_VERSION)
microperl_install: $(MICROPERL_BUILD_DIR)/.installed
$(call embtk_pinfo,"Successfully installed microperl")
diff --git a/packages/security/openssl/openssl.mk b/packages/security/openssl/openssl.mk
index 0e83db4..4abaf7b 100644
--- a/packages/security/openssl/openssl.mk
+++ b/packages/security/openssl/openssl.mk
@@ -28,8 +28,8 @@ OPENSSL_VERSION := $(call embtk_get_pkgversion,openssl)
OPENSSL_SITE := ftp://ftp.openssl.org/source
OPENSSL_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
OPENSSL_PACKAGE := openssl-$(OPENSSL_VERSION).tar.gz
-OPENSSL_SRC_DIR := $(PACKAGES_BUILD)/openssl-$(OPENSSL_VERSION)
-OPENSSL_BUILD_DIR := $(PACKAGES_BUILD)/openssl-$(OPENSSL_VERSION)
+OPENSSL_SRC_DIR := $(embtk_pkgb)/openssl-$(OPENSSL_VERSION)
+OPENSSL_BUILD_DIR := $(embtk_pkgb)/openssl-$(OPENSSL_VERSION)
OPENSSL_NODESTDIR := y
OPENSSL_MAKE_OPTS := CC=$(TARGETCC_CACHED) INSTALL_PREFIX=$(embtk_sysroot)
diff --git a/packages/system/dbus/dbus.mk b/packages/system/dbus/dbus.mk
index 23c1033..3f87628 100644
--- a/packages/system/dbus/dbus.mk
+++ b/packages/system/dbus/dbus.mk
@@ -28,8 +28,8 @@ DBUS_VERSION := $(call embtk_get_pkgversion,dbus)
DBUS_SITE := http://dbus.freedesktop.org/releases/dbus
DBUS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
DBUS_PACKAGE := dbus-$(DBUS_VERSION).tar.gz
-DBUS_SRC_DIR := $(PACKAGES_BUILD)/dbus-$(DBUS_VERSION)
-DBUS_BUILD_DIR := $(PACKAGES_BUILD)/dbus-$(DBUS_VERSION)
+DBUS_SRC_DIR := $(embtk_pkgb)/dbus-$(DBUS_VERSION)
+DBUS_BUILD_DIR := $(embtk_pkgb)/dbus-$(DBUS_VERSION)
DBUS_BINS = dbus-cleanup-sockets dbus-daemon dbus-launch \
dbus-monitor dbus-send dbus-uuidgen
diff --git a/packages/system/e2fsprogs/e2fsprogs.mk b/packages/system/e2fsprogs/e2fsprogs.mk
index b0f1299..8759bcf 100644
--- a/packages/system/e2fsprogs/e2fsprogs.mk
+++ b/packages/system/e2fsprogs/e2fsprogs.mk
@@ -28,8 +28,8 @@ E2FSPROGS_VERSION := $(call embtk_get_pkgversion,e2fsprogs)
E2FSPROGS_SITE := http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/$(E2FSPROGS_VERSION)
E2FSPROGS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
E2FSPROGS_PACKAGE := e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
-E2FSPROGS_SRC_DIR := $(PACKAGES_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
-E2FSPROGS_BUILD_DIR := $(PACKAGES_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
+E2FSPROGS_SRC_DIR := $(embtk_pkgb)/e2fsprogs-$(E2FSPROGS_VERSION)
+E2FSPROGS_BUILD_DIR := $(embtk_pkgb)/e2fsprogs-$(E2FSPROGS_VERSION)
E2FSPROGS_BINS :=
E2FSPROGS_SBINS :=
diff --git a/packages/system/upstart/upstart.mk b/packages/system/upstart/upstart.mk
index 226c3da..7ee66a2 100644
--- a/packages/system/upstart/upstart.mk
+++ b/packages/system/upstart/upstart.mk
@@ -28,7 +28,7 @@ UPSTART_MAJOR_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_UPSTART_MAJOR_VERSIO
UPSTART_SITE := http://upstart.ubuntu.com/download/$(UPSTART_MAJOR_VERSION)
UPSTART_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/upstart/$(UPSTART_VERSION)
UPSTART_PACKAGE := upstart-$(UPSTART_VERSION).tar.gz
-UPSTART_BUILD_DIR := $(PACKAGES_BUILD)/upstart-$(UPSTART_VERSION)
+UPSTART_BUILD_DIR := $(embtk_pkgb)/upstart-$(UPSTART_VERSION)
UPSTART_BINS =
UPSTART_SBINS =
@@ -64,7 +64,7 @@ endif
$(UPSTART_BUILD_DIR)/.decompressed:
$(call embtk_pinfo,"Decompressing $(UPSTART_PACKAGE) ...")
- @tar -C $(PACKAGES_BUILD) -xzf $(embtk_dldir)/$(UPSTART_PACKAGE)
+ @tar -C $(embtk_pkgb) -xzf $(embtk_dldir)/$(UPSTART_PACKAGE)
ifeq ($(CONFIG_EMBTK_UPSTART_NEED_PATCH),y)
@cd $(UPSTART_BUILD_DIR); \
patch -p1 < $(embtk_dldir)/upstart-$(UPSTART_VERSION).patch
diff --git a/packages/x11/bigreqsproto/bigreqsproto.mk b/packages/x11/bigreqsproto/bigreqsproto.mk
index 929ef0e..a9307e2 100644
--- a/packages/x11/bigreqsproto/bigreqsproto.mk
+++ b/packages/x11/bigreqsproto/bigreqsproto.mk
@@ -28,8 +28,8 @@ BIGREQSPROTO_VERSION := $(call embtk_get_pkgversion,BIGREQSPROTO)
BIGREQSPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
BIGREQSPROTO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
BIGREQSPROTO_PACKAGE := bigreqsproto-$(BIGREQSPROTO_VERSION).tar.bz2
-BIGREQSPROTO_SRC_DIR := $(PACKAGES_BUILD)/bigreqsproto-$(BIGREQSPROTO_VERSION)
-BIGREQSPROTO_BUILD_DIR := $(PACKAGES_BUILD)/bigreqsproto-$(BIGREQSPROTO_VERSION)
+BIGREQSPROTO_SRC_DIR := $(embtk_pkgb)/bigreqsproto-$(BIGREQSPROTO_VERSION)
+BIGREQSPROTO_BUILD_DIR := $(embtk_pkgb)/bigreqsproto-$(BIGREQSPROTO_VERSION)
BIGREQSPROTO_BINS =
BIGREQSPROTO_SBINS =
diff --git a/packages/x11/compositeproto/compositeproto.mk b/packages/x11/compositeproto/compositeproto.mk
index d5c91a5..8b80c32 100644
--- a/packages/x11/compositeproto/compositeproto.mk
+++ b/packages/x11/compositeproto/compositeproto.mk
@@ -27,8 +27,8 @@ COMPOSITEPROTO_NAME := compositeproto
COMPOSITEPROTO_VERSION := $(call embtk_get_pkgversion,compositeproto)
COMPOSITEPROTO_SITE := http://ftp.x.org/pub/individual/proto
COMPOSITEPROTO_PACKAGE := compositeproto-$(COMPOSITEPROTO_VERSION).tar.bz2
-COMPOSITEPROTO_SRC_DIR := $(PACKAGES_BUILD)/compositeproto-$(COMPOSITEPROTO_VERSION)
-COMPOSITEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/compositeproto-$(COMPOSITEPROTO_VERSION)
+COMPOSITEPROTO_SRC_DIR := $(embtk_pkgb)/compositeproto-$(COMPOSITEPROTO_VERSION)
+COMPOSITEPROTO_BUILD_DIR := $(embtk_pkgb)/compositeproto-$(COMPOSITEPROTO_VERSION)
COMPOSITEPROTO_BINS =
COMPOSITEPROTO_SBINS =
diff --git a/packages/x11/damageproto/damageproto.mk b/packages/x11/damageproto/damageproto.mk
index c571226..b948036 100644
--- a/packages/x11/damageproto/damageproto.mk
+++ b/packages/x11/damageproto/damageproto.mk
@@ -27,8 +27,8 @@ DAMAGEPROTO_NAME := damageproto
DAMAGEPROTO_VERSION := $(call embtk_get_pkgversion,damageproto)
DAMAGEPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
DAMAGEPROTO_PACKAGE := damageproto-$(DAMAGEPROTO_VERSION).tar.bz2
-DAMAGEPROTO_SRC_DIR := $(PACKAGES_BUILD)/damageproto-$(DAMAGEPROTO_VERSION)
-DAMAGEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/damageproto-$(DAMAGEPROTO_VERSION)
+DAMAGEPROTO_SRC_DIR := $(embtk_pkgb)/damageproto-$(DAMAGEPROTO_VERSION)
+DAMAGEPROTO_BUILD_DIR := $(embtk_pkgb)/damageproto-$(DAMAGEPROTO_VERSION)
DAMAGEPROTO_BINS =
DAMAGEPROTO_SBINS =
diff --git a/packages/x11/fixesproto/fixesproto.mk b/packages/x11/fixesproto/fixesproto.mk
index 89fc023..812901f 100644
--- a/packages/x11/fixesproto/fixesproto.mk
+++ b/packages/x11/fixesproto/fixesproto.mk
@@ -27,8 +27,8 @@ FIXESPROTO_NAME := fixesproto
FIXESPROTO_VERSION := $(call embtk_get_pkgversion,fixesproto)
FIXESPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
FIXESPROTO_PACKAGE := fixesproto-$(FIXESPROTO_VERSION).tar.bz2
-FIXESPROTO_SRC_DIR := $(PACKAGES_BUILD)/fixesproto-$(FIXESPROTO_VERSION)
-FIXESPROTO_BUILD_DIR := $(PACKAGES_BUILD)/fixesproto-$(FIXESPROTO_VERSION)
+FIXESPROTO_SRC_DIR := $(embtk_pkgb)/fixesproto-$(FIXESPROTO_VERSION)
+FIXESPROTO_BUILD_DIR := $(embtk_pkgb)/fixesproto-$(FIXESPROTO_VERSION)
FIXESPROTO_BINS =
FIXESPROTO_SBINS =
diff --git a/packages/x11/fontsproto/fontsproto.mk b/packages/x11/fontsproto/fontsproto.mk
index a6d7b9e..a4accd5 100644
--- a/packages/x11/fontsproto/fontsproto.mk
+++ b/packages/x11/fontsproto/fontsproto.mk
@@ -27,8 +27,8 @@ FONTSPROTO_NAME := fontsproto
FONTSPROTO_VERSION := $(call embtk_get_pkgversion,fontsproto)
FONTSPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
FONTSPROTO_PACKAGE := fontsproto-$(FONTSPROTO_VERSION).tar.bz2
-FONTSPROTO_SRC_DIR := $(PACKAGES_BUILD)/fontsproto-$(FONTSPROTO_VERSION)
-FONTSPROTO_BUILD_DIR := $(PACKAGES_BUILD)/fontsproto-$(FONTSPROTO_VERSION)
+FONTSPROTO_SRC_DIR := $(embtk_pkgb)/fontsproto-$(FONTSPROTO_VERSION)
+FONTSPROTO_BUILD_DIR := $(embtk_pkgb)/fontsproto-$(FONTSPROTO_VERSION)
FONTSPROTO_BINS =
FONTSPROTO_SBINS =
diff --git a/packages/x11/inputproto/inputproto.mk b/packages/x11/inputproto/inputproto.mk
index 0607690..977cc6a 100644
--- a/packages/x11/inputproto/inputproto.mk
+++ b/packages/x11/inputproto/inputproto.mk
@@ -27,8 +27,8 @@ INPUTPROTO_NAME := inputproto
INPUTPROTO_VERSION := $(call embtk_get_pkgversion,inputproto)
INPUTPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
INPUTPROTO_PACKAGE := inputproto-$(INPUTPROTO_VERSION).tar.bz2
-INPUTPROTO_SRC_DIR := $(PACKAGES_BUILD)/inputproto-$(INPUTPROTO_VERSION)
-INPUTPROTO_BUILD_DIR := $(PACKAGES_BUILD)/inputproto-$(INPUTPROTO_VERSION)
+INPUTPROTO_SRC_DIR := $(embtk_pkgb)/inputproto-$(INPUTPROTO_VERSION)
+INPUTPROTO_BUILD_DIR := $(embtk_pkgb)/inputproto-$(INPUTPROTO_VERSION)
INPUTPROTO_BINS =
INPUTPROTO_SBINS =
diff --git a/packages/x11/kbproto/kbproto.mk b/packages/x11/kbproto/kbproto.mk
index adc07b2..22fd022 100644
--- a/packages/x11/kbproto/kbproto.mk
+++ b/packages/x11/kbproto/kbproto.mk
@@ -27,8 +27,8 @@ KBPROTO_NAME := kbproto
KBPROTO_VERSION := $(call embtk_get_pkgversion,kbproto)
KBPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
KBPROTO_PACKAGE := kbproto-$(KBPROTO_VERSION).tar.bz2
-KBPROTO_SRC_DIR := $(PACKAGES_BUILD)/kbproto-$(KBPROTO_VERSION)
-KBPROTO_BUILD_DIR := $(PACKAGES_BUILD)/kbproto-$(KBPROTO_VERSION)
+KBPROTO_SRC_DIR := $(embtk_pkgb)/kbproto-$(KBPROTO_VERSION)
+KBPROTO_BUILD_DIR := $(embtk_pkgb)/kbproto-$(KBPROTO_VERSION)
KBPROTO_BINS =
KBPROTO_SBINS =
diff --git a/packages/x11/libfontenc/libfontenc.mk b/packages/x11/libfontenc/libfontenc.mk
index a728d2a..14f6f9c 100644
--- a/packages/x11/libfontenc/libfontenc.mk
+++ b/packages/x11/libfontenc/libfontenc.mk
@@ -28,8 +28,8 @@ LIBFONTENC_VERSION := $(call embtk_get_pkgversion,libfontenc)
LIBFONTENC_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBFONTENC_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBFONTENC_PACKAGE := libfontenc-$(LIBFONTENC_VERSION).tar.bz2
-LIBFONTENC_SRC_DIR := $(PACKAGES_BUILD)/libfontenc-$(LIBFONTENC_VERSION)
-LIBFONTENC_BUILD_DIR := $(PACKAGES_BUILD)/libfontenc-$(LIBFONTENC_VERSION)
+LIBFONTENC_SRC_DIR := $(embtk_pkgb)/libfontenc-$(LIBFONTENC_VERSION)
+LIBFONTENC_BUILD_DIR := $(embtk_pkgb)/libfontenc-$(LIBFONTENC_VERSION)
LIBFONTENC_BINS =
LIBFONTENC_SBINS =
diff --git a/packages/x11/libpciaccess/libpciaccess.mk b/packages/x11/libpciaccess/libpciaccess.mk
index 0fe391c..651f81d 100644
--- a/packages/x11/libpciaccess/libpciaccess.mk
+++ b/packages/x11/libpciaccess/libpciaccess.mk
@@ -28,8 +28,8 @@ LIBPCIACCESS_VERSION := $(call embtk_get_pkgversion,libpciaccess)
LIBPCIACCESS_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBPCIACCESS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBPCIACCESS_PACKAGE := libpciaccess-$(LIBPCIACCESS_VERSION).tar.gz
-LIBPCIACCESS_SRC_DIR := $(PACKAGES_BUILD)/libpciaccess-$(LIBPCIACCESS_VERSION)
-LIBPCIACCESS_BUILD_DIR := $(PACKAGES_BUILD)/libpciaccess-$(LIBPCIACCESS_VERSION)
+LIBPCIACCESS_SRC_DIR := $(embtk_pkgb)/libpciaccess-$(LIBPCIACCESS_VERSION)
+LIBPCIACCESS_BUILD_DIR := $(embtk_pkgb)/libpciaccess-$(LIBPCIACCESS_VERSION)
LIBPCIACCESS_BINS =
LIBPCIACCESS_SBINS =
diff --git a/packages/x11/libpthreadstubs/libpthreadstubs.mk b/packages/x11/libpthreadstubs/libpthreadstubs.mk
index 0e9b987..1c092f2 100644
--- a/packages/x11/libpthreadstubs/libpthreadstubs.mk
+++ b/packages/x11/libpthreadstubs/libpthreadstubs.mk
@@ -28,8 +28,8 @@ LIBPTHREADSTUBS_VERSION := $(call embtk_get_pkgversion,libpthreadstubs)
LIBPTHREADSTUBS_SITE := http://xcb.freedesktop.org/dist
LIBPTHREADSTUBS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBPTHREADSTUBS_PACKAGE := libpthread-stubs-$(LIBPTHREADSTUBS_VERSION).tar.bz2
-LIBPTHREADSTUBS_SRC_DIR := $(PACKAGES_BUILD)/libpthread-stubs-$(LIBPTHREADSTUBS_VERSION)
-LIBPTHREADSTUBS_BUILD_DIR := $(PACKAGES_BUILD)/libpthread-stubs-$(LIBPTHREADSTUBS_VERSION)
+LIBPTHREADSTUBS_SRC_DIR := $(embtk_pkgb)/libpthread-stubs-$(LIBPTHREADSTUBS_VERSION)
+LIBPTHREADSTUBS_BUILD_DIR := $(embtk_pkgb)/libpthread-stubs-$(LIBPTHREADSTUBS_VERSION)
LIBPTHREADSTUBS_BINS =
LIBPTHREADSTUBS_SBINS =
diff --git a/packages/x11/libx11/libx11.mk b/packages/x11/libx11/libx11.mk
index 955c934..844b5c4 100644
--- a/packages/x11/libx11/libx11.mk
+++ b/packages/x11/libx11/libx11.mk
@@ -28,8 +28,8 @@ LIBX11_VERSION := $(call embtk_get_pkgversion,libx11)
LIBX11_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBX11_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBX11_PACKAGE := libX11-$(LIBX11_VERSION).tar.bz2
-LIBX11_SRC_DIR := $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION)
-LIBX11_BUILD_DIR := $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION)
+LIBX11_SRC_DIR := $(embtk_pkgb)/libX11-$(LIBX11_VERSION)
+LIBX11_BUILD_DIR := $(embtk_pkgb)/libX11-$(LIBX11_VERSION)
LIBX11_BINS =
LIBX11_SBINS =
diff --git a/packages/x11/libxau/libxau.mk b/packages/x11/libxau/libxau.mk
index 8bfd64f..f7fe0fa 100644
--- a/packages/x11/libxau/libxau.mk
+++ b/packages/x11/libxau/libxau.mk
@@ -28,8 +28,8 @@ LIBXAU_VERSION := $(call embtk_get_pkgversion,libxau)
LIBXAU_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXAU_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXAU_PACKAGE := libXau-$(LIBXAU_VERSION).tar.bz2
-LIBXAU_SRC_DIR := $(PACKAGES_BUILD)/libXau-$(LIBXAU_VERSION)
-LIBXAU_BUILD_DIR := $(PACKAGES_BUILD)/libXau-$(LIBXAU_VERSION)
+LIBXAU_SRC_DIR := $(embtk_pkgb)/libXau-$(LIBXAU_VERSION)
+LIBXAU_BUILD_DIR := $(embtk_pkgb)/libXau-$(LIBXAU_VERSION)
LIBXAU_BINS =
LIBXAU_SBINS =
diff --git a/packages/x11/libxcb/libxcb.mk b/packages/x11/libxcb/libxcb.mk
index a26430f..c3484db 100644
--- a/packages/x11/libxcb/libxcb.mk
+++ b/packages/x11/libxcb/libxcb.mk
@@ -28,8 +28,8 @@ LIBXCB_VERSION := $(call embtk_get_pkgversion,libxcb)
LIBXCB_SITE := http://xcb.freedesktop.org/dist
LIBXCB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXCB_PACKAGE := libxcb-$(LIBXCB_VERSION).tar.gz
-LIBXCB_SRC_DIR := $(PACKAGES_BUILD)/libxcb-$(LIBXCB_VERSION)
-LIBXCB_BUILD_DIR := $(PACKAGES_BUILD)/libxcb-$(LIBXCB_VERSION)
+LIBXCB_SRC_DIR := $(embtk_pkgb)/libxcb-$(LIBXCB_VERSION)
+LIBXCB_BUILD_DIR := $(embtk_pkgb)/libxcb-$(LIBXCB_VERSION)
LIBXCB_BINS =
LIBXCB_SBINS =
diff --git a/packages/x11/libxcomposite/libxcomposite.mk b/packages/x11/libxcomposite/libxcomposite.mk
index 20c38ff..1866af7 100644
--- a/packages/x11/libxcomposite/libxcomposite.mk
+++ b/packages/x11/libxcomposite/libxcomposite.mk
@@ -28,8 +28,8 @@ LIBXCOMPOSITE_VERSION := $(call embtk_get_pkgversion,libxcomposite)
LIBXCOMPOSITE_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXCOMPOSITE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXCOMPOSITE_PACKAGE := libXcomposite-$(LIBXCOMPOSITE_VERSION).tar.bz2
-LIBXCOMPOSITE_SRC_DIR := $(PACKAGES_BUILD)/libXcomposite-$(LIBXCOMPOSITE_VERSION)
-LIBXCOMPOSITE_BUILD_DIR := $(PACKAGES_BUILD)/libXcomposite-$(LIBXCOMPOSITE_VERSION)
+LIBXCOMPOSITE_SRC_DIR := $(embtk_pkgb)/libXcomposite-$(LIBXCOMPOSITE_VERSION)
+LIBXCOMPOSITE_BUILD_DIR := $(embtk_pkgb)/libXcomposite-$(LIBXCOMPOSITE_VERSION)
LIBXCOMPOSITE_BINS =
LIBXCOMPOSITE_SBINS =
diff --git a/packages/x11/libxext/libxext.mk b/packages/x11/libxext/libxext.mk
index d53701c..1f03b90 100644
--- a/packages/x11/libxext/libxext.mk
+++ b/packages/x11/libxext/libxext.mk
@@ -28,8 +28,8 @@ LIBXEXT_VERSION := $(call embtk_get_pkgversion,libxext)
LIBXEXT_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXEXT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXEXT_PACKAGE := libXext-$(LIBXEXT_VERSION).tar.bz2
-LIBXEXT_SRC_DIR := $(PACKAGES_BUILD)/libXext-$(LIBXEXT_VERSION)
-LIBXEXT_BUILD_DIR := $(PACKAGES_BUILD)/libXext-$(LIBXEXT_VERSION)
+LIBXEXT_SRC_DIR := $(embtk_pkgb)/libXext-$(LIBXEXT_VERSION)
+LIBXEXT_BUILD_DIR := $(embtk_pkgb)/libXext-$(LIBXEXT_VERSION)
LIBXEXT_BINS =
LIBXEXT_SBINS =
diff --git a/packages/x11/libxfixes/libxfixes.mk b/packages/x11/libxfixes/libxfixes.mk
index 48f73d0..d832445 100644
--- a/packages/x11/libxfixes/libxfixes.mk
+++ b/packages/x11/libxfixes/libxfixes.mk
@@ -28,8 +28,8 @@ LIBXFIXES_VERSION := $(call embtk_get_pkgversion,libxfixes)
LIBXFIXES_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXFIXES_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXFIXES_PACKAGE := libXfixes-$(LIBXFIXES_VERSION).tar.bz2
-LIBXFIXES_SRC_DIR := $(PACKAGES_BUILD)/libXfixes-$(LIBXFIXES_VERSION)
-LIBXFIXES_BUILD_DIR := $(PACKAGES_BUILD)/libXfixes-$(LIBXFIXES_VERSION)
+LIBXFIXES_SRC_DIR := $(embtk_pkgb)/libXfixes-$(LIBXFIXES_VERSION)
+LIBXFIXES_BUILD_DIR := $(embtk_pkgb)/libXfixes-$(LIBXFIXES_VERSION)
LIBXFIXES_BINS =
LIBXFIXES_SBINS =
diff --git a/packages/x11/libxfont/libxfont.mk b/packages/x11/libxfont/libxfont.mk
index a4139b8..d48ab93 100644
--- a/packages/x11/libxfont/libxfont.mk
+++ b/packages/x11/libxfont/libxfont.mk
@@ -28,8 +28,8 @@ LIBXFONT_VERSION := $(call embtk_get_pkgversion,libxfont)
LIBXFONT_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXFONT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXFONT_PACKAGE := libXfont-$(LIBXFONT_VERSION).tar.bz2
-LIBXFONT_SRC_DIR := $(PACKAGES_BUILD)/libXfont-$(LIBXFONT_VERSION)
-LIBXFONT_BUILD_DIR := $(PACKAGES_BUILD)/libXfont-$(LIBXFONT_VERSION)
+LIBXFONT_SRC_DIR := $(embtk_pkgb)/libXfont-$(LIBXFONT_VERSION)
+LIBXFONT_BUILD_DIR := $(embtk_pkgb)/libXfont-$(LIBXFONT_VERSION)
LIBXFONT_BINS =
LIBXFONT_SBINS =
diff --git a/packages/x11/libxft/libxft.mk b/packages/x11/libxft/libxft.mk
index 0df1dfb..1280016 100644
--- a/packages/x11/libxft/libxft.mk
+++ b/packages/x11/libxft/libxft.mk
@@ -28,8 +28,8 @@ LIBXFT_VERSION := $(call embtk_get_pkgversion,libxft)
LIBXFT_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXFT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXFT_PACKAGE := libXft-$(LIBXFT_VERSION).tar.bz2
-LIBXFT_SRC_DIR := $(PACKAGES_BUILD)/libXft-$(LIBXFT_VERSION)
-LIBXFT_BUILD_DIR := $(PACKAGES_BUILD)/libXft-$(LIBXFT_VERSION)
+LIBXFT_SRC_DIR := $(embtk_pkgb)/libXft-$(LIBXFT_VERSION)
+LIBXFT_BUILD_DIR := $(embtk_pkgb)/libXft-$(LIBXFT_VERSION)
LIBXFT_BINS = xft-config
LIBXFT_SBINS =
diff --git a/packages/x11/libxi/libxi.mk b/packages/x11/libxi/libxi.mk
index b524925..41355e0 100644
--- a/packages/x11/libxi/libxi.mk
+++ b/packages/x11/libxi/libxi.mk
@@ -28,8 +28,8 @@ LIBXI_VERSION := $(call embtk_get_pkgversion,libxi)
LIBXI_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXI_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXI_PACKAGE := libXi-$(LIBXI_VERSION).tar.bz2
-LIBXI_SRC_DIR := $(PACKAGES_BUILD)/libXi-$(LIBXI_VERSION)
-LIBXI_BUILD_DIR := $(PACKAGES_BUILD)/libXi-$(LIBXI_VERSION)
+LIBXI_SRC_DIR := $(embtk_pkgb)/libXi-$(LIBXI_VERSION)
+LIBXI_BUILD_DIR := $(embtk_pkgb)/libXi-$(LIBXI_VERSION)
LIBXI_BINS =
LIBXI_SBINS =
diff --git a/packages/x11/libxkbfile/libxkbfile.mk b/packages/x11/libxkbfile/libxkbfile.mk
index 71bffb5..6b8ac8b 100644
--- a/packages/x11/libxkbfile/libxkbfile.mk
+++ b/packages/x11/libxkbfile/libxkbfile.mk
@@ -28,8 +28,8 @@ LIBXKBFILE_VERSION := $(call embtk_get_pkgversion,libxkbfile)
LIBXKBFILE_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXKBFILE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXKBFILE_PACKAGE := libxkbfile-$(LIBXKBFILE_VERSION).tar.bz2
-LIBXKBFILE_SRC_DIR := $(PACKAGES_BUILD)/libxkbfile-$(LIBXKBFILE_VERSION)
-LIBXKBFILE_BUILD_DIR := $(PACKAGES_BUILD)/libxkbfile-$(LIBXKBFILE_VERSION)
+LIBXKBFILE_SRC_DIR := $(embtk_pkgb)/libxkbfile-$(LIBXKBFILE_VERSION)
+LIBXKBFILE_BUILD_DIR := $(embtk_pkgb)/libxkbfile-$(LIBXKBFILE_VERSION)
LIBXKBFILE_BINS =
LIBXKBFILE_SBINS =
diff --git a/packages/x11/libxrandr/libxrandr.mk b/packages/x11/libxrandr/libxrandr.mk
index fb2cef9..b507d2f 100644
--- a/packages/x11/libxrandr/libxrandr.mk
+++ b/packages/x11/libxrandr/libxrandr.mk
@@ -28,8 +28,8 @@ LIBXRANDR_VERSION := $(call embtk_get_pkgversion,libxrandr)
LIBXRANDR_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXRANDR_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXRANDR_PACKAGE := libXrandr-$(LIBXRANDR_VERSION).tar.bz2
-LIBXRANDR_SRC_DIR := $(PACKAGES_BUILD)/libXrandr-$(LIBXRANDR_VERSION)
-LIBXRANDR_BUILD_DIR := $(PACKAGES_BUILD)/libXrandr-$(LIBXRANDR_VERSION)
+LIBXRANDR_SRC_DIR := $(embtk_pkgb)/libXrandr-$(LIBXRANDR_VERSION)
+LIBXRANDR_BUILD_DIR := $(embtk_pkgb)/libXrandr-$(LIBXRANDR_VERSION)
LIBXRANDR_BINS =
LIBXRANDR_SBINS =
diff --git a/packages/x11/libxrender/libxrender.mk b/packages/x11/libxrender/libxrender.mk
index a1b07b8..c65f826 100644
--- a/packages/x11/libxrender/libxrender.mk
+++ b/packages/x11/libxrender/libxrender.mk
@@ -28,8 +28,8 @@ LIBXRENDER_VERSION := $(call embtk_get_pkgversion,libxrender)
LIBXRENDER_SITE := http://xorg.freedesktop.org/archive/individual/lib
LIBXRENDER_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
LIBXRENDER_PACKAGE := libXrender-$(LIBXRENDER_VERSION).tar.bz2
-LIBXRENDER_SRC_DIR := $(PACKAGES_BUILD)/libXrender-$(LIBXRENDER_VERSION)
-LIBXRENDER_BUILD_DIR := $(PACKAGES_BUILD)/libXrender-$(LIBXRENDER_VERSION)
+LIBXRENDER_SRC_DIR := $(embtk_pkgb)/libXrender-$(LIBXRENDER_VERSION)
+LIBXRENDER_BUILD_DIR := $(embtk_pkgb)/libXrender-$(LIBXRENDER_VERSION)
LIBXRENDER_BINS =
LIBXRENDER_SBINS =
diff --git a/packages/x11/randrproto/randrproto.mk b/packages/x11/randrproto/randrproto.mk
index c9cb860..adfa6aa 100644
--- a/packages/x11/randrproto/randrproto.mk
+++ b/packages/x11/randrproto/randrproto.mk
@@ -27,8 +27,8 @@ RANDRPROTO_NAME := randrproto
RANDRPROTO_VERSION := $(call embtk_get_pkgversion,randrproto)
RANDRPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
RANDRPROTO_PACKAGE := randrproto-$(RANDRPROTO_VERSION).tar.bz2
-RANDRPROTO_SRC_DIR := $(PACKAGES_BUILD)/randrproto-$(RANDRPROTO_VERSION)
-RANDRPROTO_BUILD_DIR := $(PACKAGES_BUILD)/randrproto-$(RANDRPROTO_VERSION)
+RANDRPROTO_SRC_DIR := $(embtk_pkgb)/randrproto-$(RANDRPROTO_VERSION)
+RANDRPROTO_BUILD_DIR := $(embtk_pkgb)/randrproto-$(RANDRPROTO_VERSION)
RANDRPROTO_BINS =
RANDRPROTO_SBINS =
diff --git a/packages/x11/recordproto/recordproto.mk b/packages/x11/recordproto/recordproto.mk
index 4d96cb2..e4a442b 100644
--- a/packages/x11/recordproto/recordproto.mk
+++ b/packages/x11/recordproto/recordproto.mk
@@ -27,8 +27,8 @@ RECORDPROTO_NAME := recordproto
RECORDPROTO_VERSION := $(call embtk_get_pkgversion,recordproto)
RECORDPROTO_SITE := http://ftp.x.org/pub/individual/proto
RECORDPROTO_PACKAGE := recordproto-$(RECORDPROTO_VERSION).tar.bz2
-RECORDPROTO_SRC_DIR := $(PACKAGES_BUILD)/recordproto-$(RECORDPROTO_VERSION)
-RECORDPROTO_BUILD_DIR := $(PACKAGES_BUILD)/recordproto-$(RECORDPROTO_VERSION)
+RECORDPROTO_SRC_DIR := $(embtk_pkgb)/recordproto-$(RECORDPROTO_VERSION)
+RECORDPROTO_BUILD_DIR := $(embtk_pkgb)/recordproto-$(RECORDPROTO_VERSION)
RECORDPROTO_BINS =
RECORDPROTO_SBINS =
diff --git a/packages/x11/renderproto/renderproto.mk b/packages/x11/renderproto/renderproto.mk
index 118e425..72d6b82 100644
--- a/packages/x11/renderproto/renderproto.mk
+++ b/packages/x11/renderproto/renderproto.mk
@@ -27,8 +27,8 @@ RENDERPROTO_NAME := renderproto
RENDERPROTO_VERSION := $(call embtk_get_pkgversion,renderproto)
RENDERPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
RENDERPROTO_PACKAGE := renderproto-$(RENDERPROTO_VERSION).tar.bz2
-RENDERPROTO_SRC_DIR := $(PACKAGES_BUILD)/renderproto-$(RENDERPROTO_VERSION)
-RENDERPROTO_BUILD_DIR := $(PACKAGES_BUILD)/renderproto-$(RENDERPROTO_VERSION)
+RENDERPROTO_SRC_DIR := $(embtk_pkgb)/renderproto-$(RENDERPROTO_VERSION)
+RENDERPROTO_BUILD_DIR := $(embtk_pkgb)/renderproto-$(RENDERPROTO_VERSION)
RENDERPROTO_BINS =
RENDERPROTO_SBINS =
diff --git a/packages/x11/resourceproto/resourceproto.mk b/packages/x11/resourceproto/resourceproto.mk
index c8fde89..a75a68d 100644
--- a/packages/x11/resourceproto/resourceproto.mk
+++ b/packages/x11/resourceproto/resourceproto.mk
@@ -27,8 +27,8 @@ RESOURCEPROTO_NAME := resourceproto
RESOURCEPROTO_VERSION := $(call embtk_get_pkgversion,resourceproto)
RESOURCEPROTO_SITE := http://ftp.x.org/pub/individual/proto
RESOURCEPROTO_PACKAGE := resourceproto-$(RESOURCEPROTO_VERSION).tar.bz2
-RESOURCEPROTO_SRC_DIR := $(PACKAGES_BUILD)/resourceproto-$(RESOURCEPROTO_VERSION)
-RESOURCEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/resourceproto-$(RESOURCEPROTO_VERSION)
+RESOURCEPROTO_SRC_DIR := $(embtk_pkgb)/resourceproto-$(RESOURCEPROTO_VERSION)
+RESOURCEPROTO_BUILD_DIR := $(embtk_pkgb)/resourceproto-$(RESOURCEPROTO_VERSION)
RESOURCEPROTO_BINS =
RESOURCEPROTO_SBINS =
diff --git a/packages/x11/utilmacros/utilmacros.mk b/packages/x11/utilmacros/utilmacros.mk
index a6ff09f..ba7d2c3 100644
--- a/packages/x11/utilmacros/utilmacros.mk
+++ b/packages/x11/utilmacros/utilmacros.mk
@@ -28,8 +28,8 @@ UTILMACROS_VERSION := $(call embtk_get_pkgversion,utilmacros)
UTILMACROS_SITE := http://xorg.freedesktop.org/archive/individual/util
UTILMACROS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
UTILMACROS_PACKAGE := util-macros-$(UTILMACROS_VERSION).tar.bz2
-UTILMACROS_SRC_DIR := $(PACKAGES_BUILD)/util-macros-$(UTILMACROS_VERSION)
-UTILMACROS_BUILD_DIR := $(PACKAGES_BUILD)/util-macros-$(UTILMACROS_VERSION)
+UTILMACROS_SRC_DIR := $(embtk_pkgb)/util-macros-$(UTILMACROS_VERSION)
+UTILMACROS_BUILD_DIR := $(embtk_pkgb)/util-macros-$(UTILMACROS_VERSION)
UTILMACROS_BINS =
UTILMACROS_SBINS =
diff --git a/packages/x11/videoproto/videoproto.mk b/packages/x11/videoproto/videoproto.mk
index e3573e7..273a7e2 100644
--- a/packages/x11/videoproto/videoproto.mk
+++ b/packages/x11/videoproto/videoproto.mk
@@ -27,8 +27,8 @@ VIDEOPROTO_NAME := videoproto
VIDEOPROTO_VERSION := $(call embtk_get_pkgversion,videoproto)
VIDEOPROTO_SITE := http://ftp.x.org/pub/individual/proto
VIDEOPROTO_PACKAGE := videoproto-$(VIDEOPROTO_VERSION).tar.bz2
-VIDEOPROTO_SRC_DIR := $(PACKAGES_BUILD)/videoproto-$(VIDEOPROTO_VERSION)
-VIDEOPROTO_BUILD_DIR := $(PACKAGES_BUILD)/videoproto-$(VIDEOPROTO_VERSION)
+VIDEOPROTO_SRC_DIR := $(embtk_pkgb)/videoproto-$(VIDEOPROTO_VERSION)
+VIDEOPROTO_BUILD_DIR := $(embtk_pkgb)/videoproto-$(VIDEOPROTO_VERSION)
VIDEOPROTO_BINS =
VIDEOPROTO_SBINS =
diff --git a/packages/x11/xcbproto/xcbproto.mk b/packages/x11/xcbproto/xcbproto.mk
index 70d5280..6ba5936 100644
--- a/packages/x11/xcbproto/xcbproto.mk
+++ b/packages/x11/xcbproto/xcbproto.mk
@@ -26,8 +26,8 @@ XCBPROTO_NAME := xcb-proto
XCBPROTO_VERSION := $(call embtk_get_pkgversion,xcbproto)
XCBPROTO_SITE := http://xcb.freedesktop.org/dist
XCBPROTO_PACKAGE := xcb-proto-$(XCBPROTO_VERSION).tar.gz
-XCBPROTO_SRC_DIR := $(PACKAGES_BUILD)/xcb-proto-$(XCBPROTO_VERSION)
-XCBPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xcb-proto-$(XCBPROTO_VERSION)
+XCBPROTO_SRC_DIR := $(embtk_pkgb)/xcb-proto-$(XCBPROTO_VERSION)
+XCBPROTO_BUILD_DIR := $(embtk_pkgb)/xcb-proto-$(XCBPROTO_VERSION)
XCBPROTO_BINS =
XCBPROTO_SBINS =
diff --git a/packages/x11/xcbutil/xcbutil.mk b/packages/x11/xcbutil/xcbutil.mk
index 437b8db..350a372 100644
--- a/packages/x11/xcbutil/xcbutil.mk
+++ b/packages/x11/xcbutil/xcbutil.mk
@@ -28,8 +28,8 @@ XCBUTIL_VERSION := $(call embtk_get_pkgversion,xcbutil)
XCBUTIL_SITE := http://xcb.freedesktop.org/dist
XCBUTIL_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
XCBUTIL_PACKAGE := xcb-util-$(XCBUTIL_VERSION).tar.bz2
-XCBUTIL_SRC_DIR := $(PACKAGES_BUILD)/xcb-util-$(XCBUTIL_VERSION)
-XCBUTIL_BUILD_DIR := $(PACKAGES_BUILD)/xcb-util-$(XCBUTIL_VERSION)
+XCBUTIL_SRC_DIR := $(embtk_pkgb)/xcb-util-$(XCBUTIL_VERSION)
+XCBUTIL_BUILD_DIR := $(embtk_pkgb)/xcb-util-$(XCBUTIL_VERSION)
XCBUTIL_BINS =
XCBUTIL_SBINS =
diff --git a/packages/x11/xcmiscproto/xcmiscproto.mk b/packages/x11/xcmiscproto/xcmiscproto.mk
index de1fd65..3e11b2d 100644
--- a/packages/x11/xcmiscproto/xcmiscproto.mk
+++ b/packages/x11/xcmiscproto/xcmiscproto.mk
@@ -27,8 +27,8 @@ XCMISCPROTO_NAME := xcmiscproto
XCMISCPROTO_VERSION := $(call embtk_get_pkgversion,xcmiscproto)
XCMISCPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
XCMISCPROTO_PACKAGE := xcmiscproto-$(XCMISCPROTO_VERSION).tar.bz2
-XCMISCPROTO_SRC_DIR := $(PACKAGES_BUILD)/xcmiscproto-$(XCMISCPROTO_VERSION)
-XCMISCPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xcmiscproto-$(XCMISCPROTO_VERSION)
+XCMISCPROTO_SRC_DIR := $(embtk_pkgb)/xcmiscproto-$(XCMISCPROTO_VERSION)
+XCMISCPROTO_BUILD_DIR := $(embtk_pkgb)/xcmiscproto-$(XCMISCPROTO_VERSION)
XCMISCPROTO_BINS =
XCMISCPROTO_SBINS =
diff --git a/packages/x11/xextproto/xextproto.mk b/packages/x11/xextproto/xextproto.mk
index 5e76d9e..91c7787 100644
--- a/packages/x11/xextproto/xextproto.mk
+++ b/packages/x11/xextproto/xextproto.mk
@@ -27,8 +27,8 @@ XEXTPROTO_NAME := xextproto
XEXTPROTO_VERSION := $(call embtk_get_pkgversion,xextproto)
XEXTPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
XEXTPROTO_PACKAGE := xextproto-$(XEXTPROTO_VERSION).tar.bz2
-XEXTPROTO_SRC_DIR := $(PACKAGES_BUILD)/xextproto-$(XEXTPROTO_VERSION)
-XEXTPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xextproto-$(XEXTPROTO_VERSION)
+XEXTPROTO_SRC_DIR := $(embtk_pkgb)/xextproto-$(XEXTPROTO_VERSION)
+XEXTPROTO_BUILD_DIR := $(embtk_pkgb)/xextproto-$(XEXTPROTO_VERSION)
XEXTPROTO_BINS =
XEXTPROTO_SBINS =
diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.mk b/packages/x11/xf86inputevdev/xf86inputevdev.mk
index 6915b36..f13fb37 100644
--- a/packages/x11/xf86inputevdev/xf86inputevdev.mk
+++ b/packages/x11/xf86inputevdev/xf86inputevdev.mk
@@ -28,8 +28,8 @@ XF86INPUTEVDEV_VERSION := $(call embtk_get_pkgversion,xf86inputevdev)
XF86INPUTEVDEV_SITE := http://xorg.freedesktop.org/archive/individual/driver
XF86INPUTEVDEV_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
XF86INPUTEVDEV_PACKAGE := xf86-input-evdev-$(XF86INPUTEVDEV_VERSION).tar.bz2
-XF86INPUTEVDEV_SRC_DIR := $(PACKAGES_BUILD)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
-XF86INPUTEVDEV_BUILD_DIR := $(PACKAGES_BUILD)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
+XF86INPUTEVDEV_SRC_DIR := $(embtk_pkgb)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
+XF86INPUTEVDEV_BUILD_DIR := $(embtk_pkgb)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
XF86INPUTEVDEV_BINS =
XF86INPUTEVDEV_SBINS =
diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.mk b/packages/x11/xf86videofbdev/xf86videofbdev.mk
index 9bcd3d5..e2f8dc4 100644
--- a/packages/x11/xf86videofbdev/xf86videofbdev.mk
+++ b/packages/x11/xf86videofbdev/xf86videofbdev.mk
@@ -28,8 +28,8 @@ XF86VIDEOFBDEV_VERSION := $(call embtk_get_pkgversion,xf86videofbdev)
XF86VIDEOFBDEV_SITE := http://xorg.freedesktop.org/archive/individual/driver
XF86VIDEOFBDEV_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
XF86VIDEOFBDEV_PACKAGE := xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION).tar.bz2
-XF86VIDEOFBDEV_SRC_DIR := $(PACKAGES_BUILD)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
-XF86VIDEOFBDEV_BUILD_DIR := $(PACKAGES_BUILD)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
+XF86VIDEOFBDEV_SRC_DIR := $(embtk_pkgb)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
+XF86VIDEOFBDEV_BUILD_DIR := $(embtk_pkgb)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
XF86VIDEOFBDEV_BINS =
XF86VIDEOFBDEV_SBINS =
diff --git a/packages/x11/xinput/xinput.mk b/packages/x11/xinput/xinput.mk
index dc45ad1..a5c316e 100644
--- a/packages/x11/xinput/xinput.mk
+++ b/packages/x11/xinput/xinput.mk
@@ -28,8 +28,8 @@ XINPUT_VERSION := $(call embtk_get_pkgversion,xinput)
XINPUT_SITE := http://xorg.freedesktop.org/archive/individual/app
XINPUT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
XINPUT_PACKAGE := xinput-$(XINPUT_VERSION).tar.bz2
-XINPUT_SRC_DIR := $(PACKAGES_BUILD)/xinput-$(XINPUT_VERSION)
-XINPUT_BUILD_DIR := $(PACKAGES_BUILD)/xinput-$(XINPUT_VERSION)
+XINPUT_SRC_DIR := $(embtk_pkgb)/xinput-$(XINPUT_VERSION)
+XINPUT_BUILD_DIR := $(embtk_pkgb)/xinput-$(XINPUT_VERSION)
XINPUT_BINS = xinput
XINPUT_SBINS =
diff --git a/packages/x11/xkbcomp/xkbcomp.mk b/packages/x11/xkbcomp/xkbcomp.mk
index 18c4050..41d6155 100644
--- a/packages/x11/xkbcomp/xkbcomp.mk
+++ b/packages/x11/xkbcomp/xkbcomp.mk
@@ -28,8 +28,8 @@ XKBCOMP_VERSION := $(call embtk_get_pkgversion,xkbcomp)
XKBCOMP_SITE := http://xorg.freedesktop.org/archive/individual/app
XKBCOMP_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
XKBCOMP_PACKAGE := xkbcomp-$(XKBCOMP_VERSION).tar.bz2
-XKBCOMP_SRC_DIR := $(PACKAGES_BUILD)/xkbcomp-$(XKBCOMP_VERSION)
-XKBCOMP_BUILD_DIR := $(PACKAGES_BUILD)/xkbcomp-$(XKBCOMP_VERSION)
+XKBCOMP_SRC_DIR := $(embtk_pkgb)/xkbcomp-$(XKBCOMP_VERSION)
+XKBCOMP_BUILD_DIR := $(embtk_pkgb)/xkbcomp-$(XKBCOMP_VERSION)
XKBCOMP_BINS = xkbcomp
XKBCOMP_SBINS =
diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
index 07abd12..262472b 100644
--- a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
+++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
@@ -28,8 +28,8 @@ XKEYBOARDCONFIG_VERSION := $(call embtk_get_pkgversion,xkeyboardconfig)
XKEYBOARDCONFIG_SITE := http://www.x.org/releases/individual/data/xkeyboard-config
XKEYBOARDCONFIG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
XKEYBOARDCONFIG_PACKAGE := xkeyboard-config-$(XKEYBOARDCONFIG_VERSION).tar.bz2
-XKEYBOARDCONFIG_SRC_DIR := $(PACKAGES_BUILD)/xkeyboard-config-$(XKEYBOARDCONFIG_VERSION)
-XKEYBOARDCONFIG_BUILD_DIR := $(PACKAGES_BUILD)/xkeyboard-config-$(XKEYBOARDCONFIG_VERSION)
+XKEYBOARDCONFIG_SRC_DIR := $(embtk_pkgb)/xkeyboard-config-$(XKEYBOARDCONFIG_VERSION)
+XKEYBOARDCONFIG_BUILD_DIR := $(embtk_pkgb)/xkeyboard-config-$(XKEYBOARDCONFIG_VERSION)
XKEYBOARDCONFIG_DEPS := intltool_host_install xkbcomp_install
diff --git a/packages/x11/xproto/xproto.mk b/packages/x11/xproto/xproto.mk
index a6d6d0b..b973523 100644
--- a/packages/x11/xproto/xproto.mk
+++ b/packages/x11/xproto/xproto.mk
@@ -27,8 +27,8 @@ XPROTO_NAME := xproto
XPROTO_VERSION := $(call embtk_get_pkgversion,xproto)
XPROTO_SITE := http://ftp.x.org/pub/individual/proto
XPROTO_PACKAGE := xproto-$(XPROTO_VERSION).tar.bz2
-XPROTO_SRC_DIR := $(PACKAGES_BUILD)/xproto-$(XPROTO_VERSION)
-XPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xproto-$(XPROTO_VERSION)
+XPROTO_SRC_DIR := $(embtk_pkgb)/xproto-$(XPROTO_VERSION)
+XPROTO_BUILD_DIR := $(embtk_pkgb)/xproto-$(XPROTO_VERSION)
XPROTO_BINS =
XPROTO_SBINS =
diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk
index 6973cbc..65e56f7 100644
--- a/packages/x11/xserver/xserver.mk
+++ b/packages/x11/xserver/xserver.mk
@@ -28,8 +28,8 @@ XSERVER_VERSION := $(call embtk_get_pkgversion,xserver)
XSERVER_SITE := http://ftp.x.org/pub/individual/xserver
XSERVER_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
XSERVER_PACKAGE := xorg-server-$(XSERVER_VERSION).tar.bz2
-XSERVER_SRC_DIR := $(PACKAGES_BUILD)/xorg-server-$(XSERVER_VERSION)
-XSERVER_BUILD_DIR := $(PACKAGES_BUILD)/xorg-server-$(XSERVER_VERSION)
+XSERVER_SRC_DIR := $(embtk_pkgb)/xorg-server-$(XSERVER_VERSION)
+XSERVER_BUILD_DIR := $(embtk_pkgb)/xorg-server-$(XSERVER_VERSION)
XSERVER_BINS = Xfbdev X Xorg
XSERVER_SBINS =
diff --git a/packages/x11/xtrans/xtrans.mk b/packages/x11/xtrans/xtrans.mk
index 77912ae..2c5579a 100644
--- a/packages/x11/xtrans/xtrans.mk
+++ b/packages/x11/xtrans/xtrans.mk
@@ -28,8 +28,8 @@ XTRANS_VERSION := $(call embtk_get_pkgversion,xtrans)
XTRANS_SITE := http://xorg.freedesktop.org/archive/individual/lib
XTRANS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
XTRANS_PACKAGE := xtrans-$(XTRANS_VERSION).tar.bz2
-XTRANS_SRC_DIR := $(PACKAGES_BUILD)/xtrans-$(XTRANS_VERSION)
-XTRANS_BUILD_DIR := $(PACKAGES_BUILD)/xtrans-$(XTRANS_VERSION)
+XTRANS_SRC_DIR := $(embtk_pkgb)/xtrans-$(XTRANS_VERSION)
+XTRANS_BUILD_DIR := $(embtk_pkgb)/xtrans-$(XTRANS_VERSION)
XTRANS_INCLUDES := X11/xtrans
XTRANS_PKGCONFIGS := xtrans.pc