From c7cf1f753b072164452d8764e7d4b77ee0efdc88 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 21 Jul 2010 18:54:45 +0200 Subject: [PATCH] packages/*, scripts/*, config/options: remove $PKG_DIR declaration (now in config/path), include config/options with package name Signed-off-by: Stephan Raue --- config/options | 2 +- packages/accessibility/atk/build | 2 +- packages/accessibility/atk/install | 2 +- packages/addons/emulators/install | 2 +- packages/addons/emulators/scummvm/build | 2 +- packages/addons/emulators/scummvm/install | 2 +- packages/addons/emulators/zsnes/build | 2 +- packages/addons/emulators/zsnes/install | 2 +- packages/addons/games/install | 2 +- packages/addons/games/megaglest-data/build | 2 +- packages/addons/games/megaglest-source/build | 2 +- packages/addons/games/megaglest/build | 4 +--- packages/addons/games/megaglest/install | 4 +--- packages/addons/games/sauerbraten/build | 4 +--- packages/addons/games/sauerbraten/install | 4 +--- packages/addons/games/wesnoth/build | 4 +--- packages/addons/games/wesnoth/install | 4 +--- packages/audio/alsa-lib/build | 2 +- packages/audio/alsa-lib/install | 2 +- packages/audio/alsa-utils/build | 2 +- packages/audio/alsa-utils/install | 4 +--- packages/audio/alsa/build | 2 +- packages/audio/alsa/install | 4 +--- packages/audio/faac/build | 2 +- packages/audio/faac/install | 2 +- packages/audio/faad2/build | 2 +- packages/audio/faad2/install | 2 +- packages/audio/faad2/unpack | 2 +- packages/audio/flac/build | 2 +- packages/audio/flac/install | 2 +- packages/audio/libcdio/build | 2 +- packages/audio/libcdio/install | 2 +- packages/audio/libmad/build | 2 +- packages/audio/libmad/install | 2 +- packages/audio/libmms/build | 2 +- packages/audio/libmms/install | 2 +- packages/audio/libmodplug/build | 2 +- packages/audio/libmodplug/install | 2 +- packages/audio/libogg/build | 2 +- packages/audio/libogg/install | 2 +- packages/audio/libsamplerate/build | 2 +- packages/audio/libsamplerate/install | 2 +- packages/audio/libvorbis/build | 2 +- packages/audio/libvorbis/install | 2 +- packages/audio/wavpack/build | 2 +- packages/audio/wavpack/install | 2 +- packages/compress/bzip2/build | 2 +- packages/compress/bzip2/install | 2 +- packages/compress/bzip2/unpack | 2 +- packages/compress/lzo/build | 2 +- packages/compress/lzo/install | 2 +- packages/compress/unrar/build | 3 +-- packages/compress/unrar/install | 2 +- packages/compress/unzip/build | 3 +-- packages/compress/unzip/install | 2 +- packages/compress/zlib/build | 2 +- packages/compress/zlib/install | 2 +- packages/databases/mysql-hosttools/build | 2 +- packages/databases/mysql/build | 2 +- packages/databases/mysql/install | 2 +- packages/databases/sqlite/build | 2 +- packages/databases/sqlite/install | 2 +- packages/debug/gdb/build | 2 +- packages/debug/gdb/install | 2 +- packages/debug/install | 2 +- packages/debug/mesa-demos/build | 2 +- packages/debug/mesa-demos/install | 2 +- packages/debug/strace/build | 2 +- packages/debug/strace/install | 2 +- packages/devel/boost-jam/build | 2 +- packages/devel/boost/build | 2 +- packages/devel/boost/install | 2 +- packages/devel/dbus-glib-host/build | 2 +- packages/devel/dbus-glib/build | 2 +- packages/devel/dbus-glib/install | 2 +- packages/devel/eggdbus-host/build | 2 +- packages/devel/eggdbus/build | 2 +- packages/devel/eggdbus/install | 2 +- packages/devel/flex/build | 2 +- packages/devel/glib-host/build | 2 +- packages/devel/glib/build | 2 +- packages/devel/glib/install | 2 +- packages/devel/libpthread-stubs/build | 2 +- packages/devel/ncurses/build | 2 +- packages/devel/ncurses/install | 2 +- packages/devel/ncurses/unpack | 2 +- packages/devel/pcre/build | 2 +- packages/devel/pcre/install | 2 +- packages/graphics/Mesa/build | 2 +- packages/graphics/Mesa/install | 2 +- packages/graphics/cairo/build | 2 +- packages/graphics/cairo/install | 2 +- packages/graphics/glew/build | 2 +- packages/graphics/glew/install | 2 +- packages/graphics/jasper/build | 2 +- packages/graphics/jasper/install | 2 +- packages/graphics/jasper/unpack | 2 +- packages/graphics/jpeg/build | 2 +- packages/graphics/jpeg/install | 2 +- packages/graphics/libdrm/build | 2 +- packages/graphics/libdrm/install | 4 +--- packages/graphics/libjpeg-turbo/build | 2 +- packages/graphics/libjpeg-turbo/install | 2 +- packages/graphics/libpng/build | 2 +- packages/graphics/libpng/install | 2 +- packages/graphics/tiff/build | 2 +- packages/graphics/tiff/install | 2 +- packages/image/install | 4 +--- packages/lang/Python/build | 2 +- packages/lang/Python/install | 3 ++- packages/lang/lua/build | 2 +- packages/linux-firmware/install | 2 +- packages/linux-firmware/ipw2100-fw/install | 2 +- packages/linux-firmware/ipw2200-fw/install | 2 +- packages/linux-firmware/iwlwifi-1000-ucode/install | 2 +- packages/linux-firmware/iwlwifi-3945-ucode/install | 2 +- packages/linux-firmware/iwlwifi-4965-ucode/install | 2 +- packages/linux-firmware/iwlwifi-5000-ucode/install | 2 +- packages/linux-firmware/iwlwifi-5150-ucode/install | 2 +- packages/linux-firmware/iwlwifi-6000-ucode/install | 2 +- packages/linux/build | 2 +- packages/linux/install | 3 +-- packages/linux/need_unpack | 4 +--- packages/linux/unpack | 3 +-- packages/mediacenter/install | 2 +- packages/mediacenter/xbmc-theme-Confluence/install | 2 +- packages/multimedia/SDL/build | 2 +- packages/multimedia/SDL/install | 2 +- packages/multimedia/SDL_image/build | 2 +- packages/multimedia/SDL_image/install | 2 +- packages/multimedia/SDL_mixer/build | 2 +- packages/multimedia/SDL_mixer/install | 2 +- packages/multimedia/SDL_net/build | 2 +- packages/multimedia/SDL_net/install | 2 +- packages/multimedia/SDL_ttf/build | 2 +- packages/multimedia/SDL_ttf/install | 2 +- packages/multimedia/crystalhd/build | 2 +- packages/multimedia/crystalhd/install | 2 +- packages/multimedia/libass/build | 2 +- packages/multimedia/libass/install | 2 +- packages/multimedia/libmpeg2/build | 2 +- packages/multimedia/libmpeg2/install | 2 +- packages/multimedia/libva/build | 2 +- packages/multimedia/libva/install | 2 +- packages/multimedia/libvdpau/build | 2 +- packages/multimedia/libvdpau/install | 2 +- packages/multimedia/openal-soft/build | 2 +- packages/multimedia/openal-soft/install | 2 +- packages/multimedia/rtmpdump/build | 2 +- packages/multimedia/vdpauinfo/build | 2 +- packages/multimedia/vdpauinfo/install | 2 +- packages/network/avahi/build | 2 +- packages/network/avahi/install | 4 +--- packages/network/connman/build | 2 +- packages/network/connman/install | 4 +--- packages/network/dropbear/build | 2 +- packages/network/dropbear/install | 2 +- packages/network/install | 2 +- packages/network/libnl/build | 2 +- packages/network/libnl/install | 2 +- packages/network/libssh/build | 2 +- packages/network/libssh/install | 2 +- packages/network/ppp/build | 2 +- packages/network/ppp/install | 4 +--- packages/network/samba/build | 2 +- packages/network/samba/install | 4 +--- packages/network/transmission/build | 2 +- packages/network/transmission/install | 4 +--- packages/network/wicd/build | 2 +- packages/network/wicd/install | 2 +- packages/network/wireless_tools/build | 2 +- packages/network/wireless_tools/install | 2 +- packages/network/wpa_supplicant/build | 2 +- packages/network/wpa_supplicant/install | 2 +- packages/network/wpa_supplicant/unpack | 3 +-- packages/other/enca/build | 2 +- packages/other/enca/install | 2 +- packages/other/fribidi/build | 4 +--- packages/other/fribidi/install | 2 +- packages/other/libIDL-host/build | 2 +- packages/other/libIDL/build | 2 +- packages/other/libIDL/install | 2 +- packages/other/libdaemon/build | 2 +- packages/other/libdaemon/install | 2 +- packages/plugins/SABnzbd/install | 4 +--- packages/plugins/install | 2 +- packages/print/freetype/build | 2 +- packages/print/freetype/install | 2 +- packages/python/devel/Cheetah/build | 2 +- packages/python/devel/Cheetah/install | 2 +- packages/python/devel/pygobject/build | 2 +- packages/python/devel/pygobject/install | 2 +- packages/python/security/pyOpenSSL/build | 2 +- packages/python/security/pyOpenSSL/install | 2 +- packages/python/system/dbus-python/build | 2 +- packages/python/system/dbus-python/install | 2 +- packages/python/system/yenc/build | 2 +- packages/python/system/yenc/install | 2 +- packages/python/web/feedparser/build | 2 +- packages/python/web/feedparser/install | 2 +- packages/sdk/emulators-sdk/install | 2 +- packages/sdk/games-sdk/install | 2 +- packages/security/Linux-PAM/build | 2 +- packages/security/Linux-PAM/install | 5 +---- packages/security/openssl/build | 2 +- packages/security/openssl/install | 2 +- packages/security/polkit/build | 2 +- packages/security/polkit/install | 2 +- packages/testing/install | 2 +- packages/textproc/expat-host/build | 2 +- packages/textproc/expat/build | 2 +- packages/textproc/expat/install | 2 +- packages/textproc/libxml2/build | 2 +- packages/textproc/libxml2/install | 2 +- packages/textproc/xerces-c/build | 2 +- packages/textproc/xerces-c/install | 2 +- packages/toolchain/build | 2 +- packages/toolchain/devel/autotools/autoconf-2.64/build | 2 +- packages/toolchain/devel/autotools/autoconf/build | 2 +- packages/toolchain/devel/autotools/automake/build | 2 +- packages/toolchain/devel/autotools/build | 2 +- packages/toolchain/devel/autotools/libtool/build | 2 +- packages/toolchain/devel/autotools/m4/build | 2 +- packages/toolchain/devel/binutils/build | 2 +- packages/toolchain/devel/ccache/build | 2 +- packages/toolchain/devel/ccache/install | 4 +--- packages/toolchain/devel/cmake/build | 2 +- packages/toolchain/devel/configtools/build | 2 +- packages/toolchain/devel/eglibc/build | 2 +- packages/toolchain/devel/eglibc/install | 4 +--- packages/toolchain/devel/fakeroot/build | 2 +- packages/toolchain/devel/intltool/build | 2 +- packages/toolchain/devel/jam/build | 2 +- packages/toolchain/devel/libelf/build | 2 +- packages/toolchain/devel/linux-headers/install | 2 +- packages/toolchain/devel/make/build | 2 +- packages/toolchain/devel/make/install | 2 +- packages/toolchain/devel/make/unpack | 3 ++- packages/toolchain/devel/pkg-config/build | 2 +- packages/toolchain/devel/pkg-config/install | 2 +- packages/toolchain/lang/gcc-core/build | 2 +- packages/toolchain/lang/gcc-final/build | 2 +- packages/toolchain/lang/gcc-final/install | 2 +- packages/toolchain/lang/gcc/unpack | 3 ++- packages/toolchain/lang/yasm/build | 2 +- packages/toolchain/math/cloog-ppl/build | 2 +- packages/toolchain/math/cloog-ppl/unpack | 2 +- packages/toolchain/math/gmp/build | 2 +- packages/toolchain/math/mpc/build | 2 +- packages/toolchain/math/mpfr/build | 2 +- packages/toolchain/math/ppl/build | 2 +- packages/toolchain/sed/build | 2 +- packages/toolchain/sed/install | 2 +- packages/toolchain/sed/unpack | 3 ++- packages/toolchain/sysutils/squashfs/build | 2 +- packages/toolchain/sysutils/squashfs/install | 2 +- packages/tools/autoupdate/install | 4 +--- packages/tools/bc/build | 2 +- packages/tools/bc/install | 2 +- packages/tools/dialog/build | 2 +- packages/tools/dialog/install | 2 +- packages/tools/e2fsprogs/build | 2 +- packages/tools/e2fsprogs/install | 2 +- packages/tools/flashrom/build | 2 +- packages/tools/flashrom/install | 2 +- packages/tools/installer/install | 4 +--- packages/tools/syslinux/build | 2 +- packages/tools/syslinux/install | 2 +- packages/web/curl/build | 2 +- packages/web/curl/install | 2 +- packages/web/libmicrohttpd/build | 2 +- packages/web/libmicrohttpd/install | 2 +- packages/x11/app/xkbcomp/build | 2 +- packages/x11/app/xkbcomp/install | 2 +- packages/x11/app/xrandr/build | 2 +- packages/x11/app/xrandr/install | 2 +- packages/x11/app/xwd/build | 2 +- packages/x11/app/xwd/install | 4 +--- packages/x11/data/xkeyboard-config/build | 2 +- packages/x11/data/xkeyboard-config/install | 2 +- packages/x11/driver/xf86-input-evdev/build | 2 +- packages/x11/driver/xf86-input-evdev/install | 2 +- packages/x11/driver/xf86-input-synaptics/build | 2 +- packages/x11/driver/xf86-input-synaptics/install | 2 +- packages/x11/driver/xf86-input-wacom/build | 2 +- packages/x11/driver/xf86-input-wacom/install | 4 +--- packages/x11/driver/xf86-video-ati/build | 2 +- packages/x11/driver/xf86-video-ati/install | 2 +- packages/x11/driver/xf86-video-intel/build | 2 +- packages/x11/driver/xf86-video-intel/install | 2 +- packages/x11/driver/xf86-video-nvidia-legacy/build | 2 +- packages/x11/driver/xf86-video-nvidia-legacy/install | 3 +-- packages/x11/driver/xf86-video-nvidia-legacy/need_unpack | 3 +-- packages/x11/driver/xf86-video-nvidia-legacy/unpack | 4 +--- packages/x11/driver/xf86-video-nvidia/build | 2 +- packages/x11/driver/xf86-video-nvidia/install | 3 +-- packages/x11/driver/xf86-video-nvidia/need_unpack | 3 +-- packages/x11/driver/xf86-video-nvidia/unpack | 4 +--- packages/x11/font/encodings/build | 2 +- packages/x11/font/encodings/install | 2 +- packages/x11/font/font-bitstream-type1/build | 2 +- packages/x11/font/font-bitstream-type1/install | 2 +- packages/x11/font/font-cursor-misc/build | 2 +- packages/x11/font/font-cursor-misc/install | 2 +- packages/x11/font/font-misc-misc/build | 2 +- packages/x11/font/font-misc-misc/install | 4 +--- packages/x11/font/font-util/build | 2 +- packages/x11/font/font-util/install | 2 +- packages/x11/font/font-xfree86-type1/build | 2 +- packages/x11/font/font-xfree86-type1/install | 2 +- packages/x11/font/liberation-fonts/build | 2 +- packages/x11/font/liberation-fonts/install | 2 +- packages/x11/lib/libICE/build | 2 +- packages/x11/lib/libICE/install | 2 +- packages/x11/lib/libSM/build | 2 +- packages/x11/lib/libSM/install | 2 +- packages/x11/lib/libX11/build | 2 +- packages/x11/lib/libX11/install | 2 +- packages/x11/lib/libXau/build | 2 +- packages/x11/lib/libXau/install | 2 +- packages/x11/lib/libXdamage/build | 2 +- packages/x11/lib/libXdamage/install | 2 +- packages/x11/lib/libXext/build | 2 +- packages/x11/lib/libXext/install | 2 +- packages/x11/lib/libXfixes/build | 2 +- packages/x11/lib/libXfixes/install | 2 +- packages/x11/lib/libXfont/build | 2 +- packages/x11/lib/libXfont/install | 2 +- packages/x11/lib/libXft/build | 2 +- packages/x11/lib/libXft/install | 2 +- packages/x11/lib/libXi/build | 2 +- packages/x11/lib/libXi/install | 2 +- packages/x11/lib/libXinerama/build | 2 +- packages/x11/lib/libXinerama/install | 2 +- packages/x11/lib/libXmu/build | 2 +- packages/x11/lib/libXmu/install | 2 +- packages/x11/lib/libXrandr/build | 2 +- packages/x11/lib/libXrandr/install | 2 +- packages/x11/lib/libXrender/build | 2 +- packages/x11/lib/libXrender/install | 2 +- packages/x11/lib/libXt/build | 2 +- packages/x11/lib/libXt/install | 2 +- packages/x11/lib/libXtst/build | 2 +- packages/x11/lib/libXtst/install | 2 +- packages/x11/lib/libXxf86vm/build | 2 +- packages/x11/lib/libXxf86vm/install | 2 +- packages/x11/lib/libfontenc/build | 2 +- packages/x11/lib/libpciaccess/build | 2 +- packages/x11/lib/libpciaccess/install | 2 +- packages/x11/lib/libpciaccess/url | 2 +- packages/x11/lib/libxcb/build | 2 +- packages/x11/lib/libxcb/install | 2 +- packages/x11/lib/libxkbfile/build | 2 +- packages/x11/lib/pixman/build | 2 +- packages/x11/lib/pixman/install | 2 +- packages/x11/lib/xtrans/build | 2 +- packages/x11/other/fontconfig/build | 2 +- packages/x11/other/fontconfig/install | 2 +- packages/x11/other/ratpoison/build | 2 +- packages/x11/other/ratpoison/install | 4 +--- packages/x11/proto/bigreqsproto/build | 2 +- packages/x11/proto/damageproto/build | 2 +- packages/x11/proto/dri2proto/build | 2 +- packages/x11/proto/fixesproto/build | 2 +- packages/x11/proto/fontcacheproto/build | 2 +- packages/x11/proto/fontsproto/build | 2 +- packages/x11/proto/glproto/build | 2 +- packages/x11/proto/inputproto/build | 2 +- packages/x11/proto/kbproto/build | 2 +- packages/x11/proto/randrproto/build | 2 +- packages/x11/proto/recordproto/build | 2 +- packages/x11/proto/renderproto/build | 2 +- packages/x11/proto/scrnsaverproto/build | 2 +- packages/x11/proto/videoproto/build | 2 +- packages/x11/proto/xcb-proto/build | 2 +- packages/x11/proto/xcmiscproto/build | 2 +- packages/x11/proto/xextproto/build | 2 +- packages/x11/proto/xf86dgaproto/build | 2 +- packages/x11/proto/xf86driproto/build | 2 +- packages/x11/proto/xf86miscproto/build | 2 +- packages/x11/proto/xf86vidmodeproto/build | 2 +- packages/x11/proto/xineramaproto/build | 2 +- packages/x11/proto/xproto/build | 2 +- packages/x11/toolkits/gdk-pixbuf/build | 2 +- packages/x11/toolkits/gdk-pixbuf/install | 3 +-- packages/x11/toolkits/gtk+/build | 2 +- packages/x11/toolkits/gtk+/install | 3 +-- packages/x11/toolkits/pango/build | 2 +- packages/x11/toolkits/pango/install | 3 +-- packages/x11/util/util-macros/build | 2 +- packages/x11/xserver/xorg-server/build | 2 +- packages/x11/xserver/xorg-server/install | 3 +-- scripts/build | 4 +--- scripts/clean | 4 +--- scripts/create_addon | 4 +--- scripts/extract | 4 +--- scripts/get | 4 +--- scripts/install | 4 +--- scripts/unpack | 4 +--- 399 files changed, 403 insertions(+), 485 deletions(-) diff --git a/config/options b/config/options index e162d8f767..979a69a53d 100644 --- a/config/options +++ b/config/options @@ -99,4 +99,4 @@ get_graphicdrivers() { done } -. config/path +. config/path $1 diff --git a/packages/accessibility/atk/build b/packages/accessibility/atk/build index 3ebe446def..83e7f66d60 100755 --- a/packages/accessibility/atk/build +++ b/packages/accessibility/atk/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build glib diff --git a/packages/accessibility/atk/install b/packages/accessibility/atk/install index 918449b7f9..5d83cdf347 100755 --- a/packages/accessibility/atk/install +++ b/packages/accessibility/atk/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install glib diff --git a/packages/addons/emulators/install b/packages/addons/emulators/install index 7079c1e824..d1f9e310ab 100755 --- a/packages/addons/emulators/install +++ b/packages/addons/emulators/install @@ -1,5 +1,5 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install mame $2 diff --git a/packages/addons/emulators/scummvm/build b/packages/addons/emulators/scummvm/build index 7c8129f6d7..3cb8b2dda6 100755 --- a/packages/addons/emulators/scummvm/build +++ b/packages/addons/emulators/scummvm/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 require_cxx $1 diff --git a/packages/addons/emulators/scummvm/install b/packages/addons/emulators/scummvm/install index 1de708a24a..d6f07404d7 100755 --- a/packages/addons/emulators/scummvm/install +++ b/packages/addons/emulators/scummvm/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 require_cxx $1 diff --git a/packages/addons/emulators/zsnes/build b/packages/addons/emulators/zsnes/build index 8c959b129f..bbca51cde1 100755 --- a/packages/addons/emulators/zsnes/build +++ b/packages/addons/emulators/zsnes/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build SDL diff --git a/packages/addons/emulators/zsnes/install b/packages/addons/emulators/zsnes/install index 91c10e4148..7dd3cd765e 100755 --- a/packages/addons/emulators/zsnes/install +++ b/packages/addons/emulators/zsnes/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install SDL $SCRIPTS/install zlib diff --git a/packages/addons/games/install b/packages/addons/games/install index 59c4c4653f..a6070c0343 100755 --- a/packages/addons/games/install +++ b/packages/addons/games/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install megaglest $2 $SCRIPTS/install sauerbraten $2 diff --git a/packages/addons/games/megaglest-data/build b/packages/addons/games/megaglest-data/build index a7f8152a32..12275f901e 100755 --- a/packages/addons/games/megaglest-data/build +++ b/packages/addons/games/megaglest-data/build @@ -1,5 +1,5 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/addons/games/megaglest-source/build b/packages/addons/games/megaglest-source/build index 9cf1952a8d..709cb94fdc 100755 --- a/packages/addons/games/megaglest-source/build +++ b/packages/addons/games/megaglest-source/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build lua diff --git a/packages/addons/games/megaglest/build b/packages/addons/games/megaglest/build index 4f9600ce66..738ae67e21 100755 --- a/packages/addons/games/megaglest/build +++ b/packages/addons/games/megaglest/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 ADDON_ID="addon.games.$1" ADDON_VERSION="1" @@ -8,8 +8,6 @@ ADDON_VERSION="1" $SCRIPTS/build megaglest-source $SCRIPTS/build megaglest-data -PKG_DIR=`find $ROOT/$PACKAGES -type d -name $1` - mkdir -p $BUILD/$1 cd $BUILD/$1 diff --git a/packages/addons/games/megaglest/install b/packages/addons/games/megaglest/install index f3f6cedb4c..ca3fa0e36e 100755 --- a/packages/addons/games/megaglest/install +++ b/packages/addons/games/megaglest/install @@ -1,12 +1,10 @@ #!/bin/sh -. config/options +. config/options $1 ADDON_ID="addon.games.$1" ADDON_VERSION="1" -PKG_DIR=`find $PACKAGES -type d -name $1` - if [ "$2" = addons ]; then mkdir -p $TARGET_ADDONS/$ADDON_ID cp $BUILD/$1/.addons/$ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $TARGET_ADDONS/$ADDON_ID diff --git a/packages/addons/games/sauerbraten/build b/packages/addons/games/sauerbraten/build index 47c08c1134..ff0673a92e 100755 --- a/packages/addons/games/sauerbraten/build +++ b/packages/addons/games/sauerbraten/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib @@ -15,8 +15,6 @@ $SCRIPTS/build Mesa ADDON_ID="addon.games.$1" ADDON_VERSION="1" -PKG_DIR=`find $ROOT/$PACKAGES -type d -name $1` - cd $BUILD/$1/src cd enet diff --git a/packages/addons/games/sauerbraten/install b/packages/addons/games/sauerbraten/install index f3f6cedb4c..ca3fa0e36e 100755 --- a/packages/addons/games/sauerbraten/install +++ b/packages/addons/games/sauerbraten/install @@ -1,12 +1,10 @@ #!/bin/sh -. config/options +. config/options $1 ADDON_ID="addon.games.$1" ADDON_VERSION="1" -PKG_DIR=`find $PACKAGES -type d -name $1` - if [ "$2" = addons ]; then mkdir -p $TARGET_ADDONS/$ADDON_ID cp $BUILD/$1/.addons/$ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $TARGET_ADDONS/$ADDON_ID diff --git a/packages/addons/games/wesnoth/build b/packages/addons/games/wesnoth/build index 91936c3c21..9d0d759ab7 100755 --- a/packages/addons/games/wesnoth/build +++ b/packages/addons/games/wesnoth/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build boost @@ -18,8 +18,6 @@ $SCRIPTS/build SDL_ttf ADDON_ID="addon.games.$1" ADDON_VERSION="1" -PKG_DIR=`find $ROOT/$PACKAGES -type d -name $1` - cd $PKG_BUILD rm -rf build diff --git a/packages/addons/games/wesnoth/install b/packages/addons/games/wesnoth/install index 0020e0dffd..7f5191f63b 100755 --- a/packages/addons/games/wesnoth/install +++ b/packages/addons/games/wesnoth/install @@ -1,12 +1,10 @@ #!/bin/sh -. config/options +. config/options $1 ADDON_ID="addon.games.$1" ADDON_VERSION="1" -PKG_DIR=`find $PACKAGES -type d -name $1` - if [ "$2" = addons ]; then mkdir -p $TARGET_ADDONS/$ADDON_ID cp $PKG_BUILD/.addons/$ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $TARGET_ADDONS/$ADDON_ID diff --git a/packages/audio/alsa-lib/build b/packages/audio/alsa-lib/build index 3232429097..984edd7348 100755 --- a/packages/audio/alsa-lib/build +++ b/packages/audio/alsa-lib/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/alsa-lib/install b/packages/audio/alsa-lib/install index a5b67416a1..665ff9db02 100755 --- a/packages/audio/alsa-lib/install +++ b/packages/audio/alsa-lib/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 add_group audio 63 diff --git a/packages/audio/alsa-utils/build b/packages/audio/alsa-utils/build index e9dd9aa265..5d66e22a9a 100755 --- a/packages/audio/alsa-utils/build +++ b/packages/audio/alsa-utils/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build alsa-lib diff --git a/packages/audio/alsa-utils/install b/packages/audio/alsa-utils/install index 8f6dd20fc2..a3cae38a11 100755 --- a/packages/audio/alsa-utils/install +++ b/packages/audio/alsa-utils/install @@ -1,11 +1,9 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install alsa-lib -PKG_DIR=`find $PACKAGES -type d -name $1` - mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/amixer/amixer $INSTALL/usr/bin cp $PKG_DIR/scripts/soundconfig $INSTALL/usr/bin diff --git a/packages/audio/alsa/build b/packages/audio/alsa/build index 1df260d858..3dc9f7aa12 100755 --- a/packages/audio/alsa/build +++ b/packages/audio/alsa/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build alsa-lib $SCRIPTS/build alsa-utils diff --git a/packages/audio/alsa/install b/packages/audio/alsa/install index 689eec2fa0..2ebeb5af77 100755 --- a/packages/audio/alsa/install +++ b/packages/audio/alsa/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 $SCRIPTS/install alsa-lib $SCRIPTS/install alsa-utils diff --git a/packages/audio/faac/build b/packages/audio/faac/build index 75aef1044d..fe025c7058 100755 --- a/packages/audio/faac/build +++ b/packages/audio/faac/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/faac/install b/packages/audio/faac/install index 938ddfbff1..939463c8e3 100755 --- a/packages/audio/faac/install +++ b/packages/audio/faac/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/libfaac/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/audio/faad2/build b/packages/audio/faad2/build index 20dee12e4a..d152dd9fcf 100755 --- a/packages/audio/faad2/build +++ b/packages/audio/faad2/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/faad2/install b/packages/audio/faad2/install index d57cae58b7..bfa9f18c1a 100755 --- a/packages/audio/faad2/install +++ b/packages/audio/faad2/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/libfaad/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/audio/faad2/unpack b/packages/audio/faad2/unpack index 42e716b919..a9a42e2fa7 100755 --- a/packages/audio/faad2/unpack +++ b/packages/audio/faad2/unpack @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 cp $BUILD/configtools/config.guess $BUILD/$1* cp $BUILD/configtools/config.sub $BUILD/$1* diff --git a/packages/audio/flac/build b/packages/audio/flac/build index c051c04ecc..eb1a064697 100755 --- a/packages/audio/flac/build +++ b/packages/audio/flac/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libogg diff --git a/packages/audio/flac/install b/packages/audio/flac/install index f170fd31e1..89e4e36ce5 100755 --- a/packages/audio/flac/install +++ b/packages/audio/flac/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libogg diff --git a/packages/audio/libcdio/build b/packages/audio/libcdio/build index 02bc2a7d6b..b51def16f2 100755 --- a/packages/audio/libcdio/build +++ b/packages/audio/libcdio/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/libcdio/install b/packages/audio/libcdio/install index 47eda43f0c..abc5712339 100755 --- a/packages/audio/libcdio/install +++ b/packages/audio/libcdio/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib diff --git a/packages/audio/libmad/build b/packages/audio/libmad/build index 69b87e51d9..6a8afb8a41 100755 --- a/packages/audio/libmad/build +++ b/packages/audio/libmad/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/libmad/install b/packages/audio/libmad/install index ed9fd00fc6..98caa5e53d 100755 --- a/packages/audio/libmad/install +++ b/packages/audio/libmad/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/audio/libmms/build b/packages/audio/libmms/build index 10c0473503..4992e565f1 100755 --- a/packages/audio/libmms/build +++ b/packages/audio/libmms/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build glib diff --git a/packages/audio/libmms/install b/packages/audio/libmms/install index 9ab96ceeed..2e2981e5ef 100755 --- a/packages/audio/libmms/install +++ b/packages/audio/libmms/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install glib diff --git a/packages/audio/libmodplug/build b/packages/audio/libmodplug/build index aab03ad6ba..c7a6a0997d 100755 --- a/packages/audio/libmodplug/build +++ b/packages/audio/libmodplug/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/libmodplug/install b/packages/audio/libmodplug/install index 1b844fca86..18a3892c82 100755 --- a/packages/audio/libmodplug/install +++ b/packages/audio/libmodplug/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/audio/libogg/build b/packages/audio/libogg/build index 72683176a4..1d3eb43bba 100755 --- a/packages/audio/libogg/build +++ b/packages/audio/libogg/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/libogg/install b/packages/audio/libogg/install index 112d939c9a..2187d7d31f 100755 --- a/packages/audio/libogg/install +++ b/packages/audio/libogg/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/src/.libs/libogg*.so* $INSTALL/usr/lib diff --git a/packages/audio/libsamplerate/build b/packages/audio/libsamplerate/build index 88d6cded80..9504299be2 100755 --- a/packages/audio/libsamplerate/build +++ b/packages/audio/libsamplerate/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/libsamplerate/install b/packages/audio/libsamplerate/install index 1ee13654c9..b4d582ea1f 100755 --- a/packages/audio/libsamplerate/install +++ b/packages/audio/libsamplerate/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/audio/libvorbis/build b/packages/audio/libvorbis/build index 98dab92c22..c62ccd3d5d 100755 --- a/packages/audio/libvorbis/build +++ b/packages/audio/libvorbis/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libogg diff --git a/packages/audio/libvorbis/install b/packages/audio/libvorbis/install index dba8411019..2a81499420 100755 --- a/packages/audio/libvorbis/install +++ b/packages/audio/libvorbis/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libogg mkdir -p $INSTALL/usr/lib diff --git a/packages/audio/wavpack/build b/packages/audio/wavpack/build index f4aac6e467..f887f8ecc2 100755 --- a/packages/audio/wavpack/build +++ b/packages/audio/wavpack/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/audio/wavpack/install b/packages/audio/wavpack/install index 1ee13654c9..b4d582ea1f 100755 --- a/packages/audio/wavpack/install +++ b/packages/audio/wavpack/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/compress/bzip2/build b/packages/compress/bzip2/build index 2faaff8b4c..cf3b637780 100755 --- a/packages/compress/bzip2/build +++ b/packages/compress/bzip2/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/compress/bzip2/install b/packages/compress/bzip2/install index 0558086e0d..7fa2e087e4 100755 --- a/packages/compress/bzip2/install +++ b/packages/compress/bzip2/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/*.so* $INSTALL/usr/lib diff --git a/packages/compress/bzip2/unpack b/packages/compress/bzip2/unpack index c8421e724b..71de4b58e0 100755 --- a/packages/compress/bzip2/unpack +++ b/packages/compress/bzip2/unpack @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 SRC_DIR=`ls -d $PKG_BUILD` diff --git a/packages/compress/lzo/build b/packages/compress/lzo/build index 3e25cf2020..0cfa21689a 100755 --- a/packages/compress/lzo/build +++ b/packages/compress/lzo/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/compress/lzo/install b/packages/compress/lzo/install index 1ee13654c9..b4d582ea1f 100755 --- a/packages/compress/lzo/install +++ b/packages/compress/lzo/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/compress/unrar/build b/packages/compress/unrar/build index 191fba2f6e..475f55ce6b 100755 --- a/packages/compress/unrar/build +++ b/packages/compress/unrar/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain @@ -12,4 +12,3 @@ make CC=$TARGET_CC \ STRIP=$TARGET_STRIP \ -f makefile.unix - diff --git a/packages/compress/unrar/install b/packages/compress/unrar/install index 17a106610b..740f6c9a61 100755 --- a/packages/compress/unrar/install +++ b/packages/compress/unrar/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/bin cp $BUILD/$1/unrar $INSTALL/usr/bin diff --git a/packages/compress/unzip/build b/packages/compress/unzip/build index dbd7698aa2..f476b86876 100755 --- a/packages/compress/unzip/build +++ b/packages/compress/unzip/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain @@ -12,4 +12,3 @@ make CC=$TARGET_CC \ STRIP=$TARGET_STRIP \ -f unix/Makefile generic - diff --git a/packages/compress/unzip/install b/packages/compress/unzip/install index abc5843a1f..bf46a5774e 100755 --- a/packages/compress/unzip/install +++ b/packages/compress/unzip/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/bin cp $BUILD/$1*/unzip $INSTALL/usr/bin diff --git a/packages/compress/zlib/build b/packages/compress/zlib/build index ba821d844a..dbb3ff5b2c 100755 --- a/packages/compress/zlib/build +++ b/packages/compress/zlib/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/compress/zlib/install b/packages/compress/zlib/install index 378acda7bf..5feefa2581 100755 --- a/packages/compress/zlib/install +++ b/packages/compress/zlib/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib diff --git a/packages/databases/mysql-hosttools/build b/packages/databases/mysql-hosttools/build index aff2b8875e..bb27c90213 100755 --- a/packages/databases/mysql-hosttools/build +++ b/packages/databases/mysql-hosttools/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/unpack mysql diff --git a/packages/databases/mysql/build b/packages/databases/mysql/build index 2603d2f838..9339ebba0b 100755 --- a/packages/databases/mysql/build +++ b/packages/databases/mysql/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/databases/mysql/install b/packages/databases/mysql/install index 659caf0ced..1bb862621b 100755 --- a/packages/databases/mysql/install +++ b/packages/databases/mysql/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ncurses $SCRIPTS/install zlib diff --git a/packages/databases/sqlite/build b/packages/databases/sqlite/build index 1c12b1c514..3601f7ba0d 100755 --- a/packages/databases/sqlite/build +++ b/packages/databases/sqlite/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/databases/sqlite/install b/packages/databases/sqlite/install index 1b82f1516e..b0415fb884 100755 --- a/packages/databases/sqlite/install +++ b/packages/databases/sqlite/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 # mkdir -p $INSTALL/usr/bin # cp $PKG_BUILD/.libs/sqlite3 $INSTALL/usr/bin diff --git a/packages/debug/gdb/build b/packages/debug/gdb/build index b66eff3862..a26d4edf63 100755 --- a/packages/debug/gdb/build +++ b/packages/debug/gdb/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build ncurses diff --git a/packages/debug/gdb/install b/packages/debug/gdb/install index be171c982b..1222bd6f49 100755 --- a/packages/debug/gdb/install +++ b/packages/debug/gdb/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ncurses $SCRIPTS/install expat diff --git a/packages/debug/install b/packages/debug/install index a17bd11732..b812a7e807 100755 --- a/packages/debug/install +++ b/packages/debug/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install strace $SCRIPTS/install gdb diff --git a/packages/debug/mesa-demos/build b/packages/debug/mesa-demos/build index d73a53f2f1..a76a55c7f7 100755 --- a/packages/debug/mesa-demos/build +++ b/packages/debug/mesa-demos/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build libX11 $SCRIPTS/build Mesa diff --git a/packages/debug/mesa-demos/install b/packages/debug/mesa-demos/install index d75b56f0b8..4dd826ce32 100755 --- a/packages/debug/mesa-demos/install +++ b/packages/debug/mesa-demos/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 $SCRIPTS/install Mesa diff --git a/packages/debug/strace/build b/packages/debug/strace/build index ff2d333b3c..8d7a888fc0 100755 --- a/packages/debug/strace/build +++ b/packages/debug/strace/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/debug/strace/install b/packages/debug/strace/install index 1e03e35aff..b0a66ddf9c 100755 --- a/packages/debug/strace/install +++ b/packages/debug/strace/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/strace $INSTALL/usr/bin diff --git a/packages/devel/boost-jam/build b/packages/devel/boost-jam/build index 0a986db535..e67b584a17 100755 --- a/packages/devel/boost-jam/build +++ b/packages/devel/boost-jam/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/unpack boost diff --git a/packages/devel/boost/build b/packages/devel/boost/build index 674ffdb500..b642988b2b 100755 --- a/packages/devel/boost/build +++ b/packages/devel/boost/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build boost-jam diff --git a/packages/devel/boost/install b/packages/devel/boost/install index 15a8ca1f7a..bb41ea7784 100755 --- a/packages/devel/boost/install +++ b/packages/devel/boost/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib $SCRIPTS/install bzip2 diff --git a/packages/devel/dbus-glib-host/build b/packages/devel/dbus-glib-host/build index f0f7e9b5e7..abe586fef1 100755 --- a/packages/devel/dbus-glib-host/build +++ b/packages/devel/dbus-glib-host/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build glib-host diff --git a/packages/devel/dbus-glib/build b/packages/devel/dbus-glib/build index cb2056ab21..ec888fd6f8 100755 --- a/packages/devel/dbus-glib/build +++ b/packages/devel/dbus-glib/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build dbus diff --git a/packages/devel/dbus-glib/install b/packages/devel/dbus-glib/install index fb8c31a5f3..82a65ad0b7 100755 --- a/packages/devel/dbus-glib/install +++ b/packages/devel/dbus-glib/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install dbus $SCRIPTS/install glib diff --git a/packages/devel/eggdbus-host/build b/packages/devel/eggdbus-host/build index 9f2dcf52fe..1e29b29f49 100755 --- a/packages/devel/eggdbus-host/build +++ b/packages/devel/eggdbus-host/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/unpack eggdbus diff --git a/packages/devel/eggdbus/build b/packages/devel/eggdbus/build index 3a0eee950e..5bb0a0d0d6 100755 --- a/packages/devel/eggdbus/build +++ b/packages/devel/eggdbus/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build eggdbus-host diff --git a/packages/devel/eggdbus/install b/packages/devel/eggdbus/install index 1b8a918d63..e99afa8656 100755 --- a/packages/devel/eggdbus/install +++ b/packages/devel/eggdbus/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install glib $SCRIPTS/install dbus diff --git a/packages/devel/flex/build b/packages/devel/flex/build index 835234aa58..9623c10fd4 100755 --- a/packages/devel/flex/build +++ b/packages/devel/flex/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/devel/glib-host/build b/packages/devel/glib-host/build index 778782f958..4e033597c2 100755 --- a/packages/devel/glib-host/build +++ b/packages/devel/glib-host/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build dbus-host diff --git a/packages/devel/glib/build b/packages/devel/glib/build index 71ad13c555..ff71d30189 100755 --- a/packages/devel/glib/build +++ b/packages/devel/glib/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/devel/glib/install b/packages/devel/glib/install index 74573150f8..e78ee60e54 100755 --- a/packages/devel/glib/install +++ b/packages/devel/glib/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib diff --git a/packages/devel/libpthread-stubs/build b/packages/devel/libpthread-stubs/build index bf0948d217..d44875fe84 100755 --- a/packages/devel/libpthread-stubs/build +++ b/packages/devel/libpthread-stubs/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/devel/ncurses/build b/packages/devel/ncurses/build index ae485ffe42..31bc3c29c1 100755 --- a/packages/devel/ncurses/build +++ b/packages/devel/ncurses/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 CWD=`pwd` diff --git a/packages/devel/ncurses/install b/packages/devel/ncurses/install index 2c633aa6ae..b21cf17421 100755 --- a/packages/devel/ncurses/install +++ b/packages/devel/ncurses/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/libncurses.so* $INSTALL/usr/lib diff --git a/packages/devel/ncurses/unpack b/packages/devel/ncurses/unpack index 1044ce1e41..56930c6f95 100755 --- a/packages/devel/ncurses/unpack +++ b/packages/devel/ncurses/unpack @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/devel/pcre/build b/packages/devel/pcre/build index 092096f9a1..a80a5bbe1f 100755 --- a/packages/devel/pcre/build +++ b/packages/devel/pcre/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/devel/pcre/install b/packages/devel/pcre/install index bb1180f3b9..99a6a18263 100755 --- a/packages/devel/pcre/install +++ b/packages/devel/pcre/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/.libs/libpcre*.so*[.0-9] $INSTALL/usr/lib diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index ec054929c0..9cd1ec469d 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build expat $SCRIPTS/build glproto diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 6f2db04e54..83521b5f5c 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libXdamage $SCRIPTS/install libdrm diff --git a/packages/graphics/cairo/build b/packages/graphics/cairo/build index 206761af1b..269d9f00e5 100755 --- a/packages/graphics/cairo/build +++ b/packages/graphics/cairo/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/graphics/cairo/install b/packages/graphics/cairo/install index cb3408d5b9..b5ed0bd0d8 100755 --- a/packages/graphics/cairo/install +++ b/packages/graphics/cairo/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib $SCRIPTS/install freetype diff --git a/packages/graphics/glew/build b/packages/graphics/glew/build index 01d533c81d..fa6ffb3bd0 100755 --- a/packages/graphics/glew/build +++ b/packages/graphics/glew/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libX11 diff --git a/packages/graphics/glew/install b/packages/graphics/glew/install index 80712e9fa9..808fcee24b 100755 --- a/packages/graphics/glew/install +++ b/packages/graphics/glew/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 $SCRIPTS/install libXext diff --git a/packages/graphics/jasper/build b/packages/graphics/jasper/build index 3e25cf2020..0cfa21689a 100755 --- a/packages/graphics/jasper/build +++ b/packages/graphics/jasper/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/graphics/jasper/install b/packages/graphics/jasper/install index 48bb9fc557..510af9be42 100755 --- a/packages/graphics/jasper/install +++ b/packages/graphics/jasper/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/src/libjasper/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/graphics/jasper/unpack b/packages/graphics/jasper/unpack index 37009238b2..edc69ccc9d 100755 --- a/packages/graphics/jasper/unpack +++ b/packages/graphics/jasper/unpack @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 cp $BUILD/configtools/config.guess $BUILD/$1*/acaux cp $BUILD/configtools/config.sub $BUILD/$1*/acaux \ No newline at end of file diff --git a/packages/graphics/jpeg/build b/packages/graphics/jpeg/build index 50aed830af..f3c7bf539a 100755 --- a/packages/graphics/jpeg/build +++ b/packages/graphics/jpeg/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/graphics/jpeg/install b/packages/graphics/jpeg/install index ed9fd00fc6..98caa5e53d 100755 --- a/packages/graphics/jpeg/install +++ b/packages/graphics/jpeg/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/graphics/libdrm/build b/packages/graphics/libdrm/build index 25c96b8b4b..797221c0a9 100755 --- a/packages/graphics/libdrm/build +++ b/packages/graphics/libdrm/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libpthread-stubs diff --git a/packages/graphics/libdrm/install b/packages/graphics/libdrm/install index f41be89b3e..28917ff085 100755 --- a/packages/graphics/libdrm/install +++ b/packages/graphics/libdrm/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 get_graphicdrivers diff --git a/packages/graphics/libjpeg-turbo/build b/packages/graphics/libjpeg-turbo/build index 5132ce7877..f574401fb6 100755 --- a/packages/graphics/libjpeg-turbo/build +++ b/packages/graphics/libjpeg-turbo/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/graphics/libjpeg-turbo/install b/packages/graphics/libjpeg-turbo/install index 749e6fbe70..165665d2fd 100755 --- a/packages/graphics/libjpeg-turbo/install +++ b/packages/graphics/libjpeg-turbo/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/graphics/libpng/build b/packages/graphics/libpng/build index 1a0aa3a701..96a3e3e80c 100755 --- a/packages/graphics/libpng/build +++ b/packages/graphics/libpng/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/graphics/libpng/install b/packages/graphics/libpng/install index e0c36c6dbb..c68cfad8b5 100755 --- a/packages/graphics/libpng/install +++ b/packages/graphics/libpng/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/.libs/libpng14.so* $INSTALL/usr/lib diff --git a/packages/graphics/tiff/build b/packages/graphics/tiff/build index 766ac793e8..6827c27143 100755 --- a/packages/graphics/tiff/build +++ b/packages/graphics/tiff/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build $LIBJPEG diff --git a/packages/graphics/tiff/install b/packages/graphics/tiff/install index b2e8760c5c..81823d1ad2 100755 --- a/packages/graphics/tiff/install +++ b/packages/graphics/tiff/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install $LIBJPEG $SCRIPTS/install zlib diff --git a/packages/image/install b/packages/image/install index e7ed8aaefc..958ebaaafa 100755 --- a/packages/image/install +++ b/packages/image/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -#PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then BUILD_DATE=`date +%Y%m%d` diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 2706a04eb2..c5d8facd8e 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build sqlite diff --git a/packages/lang/Python/install b/packages/lang/Python/install index 63e28a4959..69e4b14e5c 100755 --- a/packages/lang/Python/install +++ b/packages/lang/Python/install @@ -1,9 +1,10 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install openssl $SCRIPTS/install zlib +$SCRIPTS/install libffi PYTHON_VERSION=2.6 PYTHON_LIB_DIR=$INSTALL/usr/lib/python$PYTHON_VERSION diff --git a/packages/lang/lua/build b/packages/lang/lua/build index e79fef2c0e..c6a5cb3ed6 100755 --- a/packages/lang/lua/build +++ b/packages/lang/lua/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/linux-firmware/install b/packages/linux-firmware/install index cffa929e6a..f0a3661bdb 100755 --- a/packages/linux-firmware/install +++ b/packages/linux-firmware/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 for firmware in $FIRMWARE; do diff --git a/packages/linux-firmware/ipw2100-fw/install b/packages/linux-firmware/ipw2100-fw/install index 489c3c2f77..3fdf7ee6c5 100755 --- a/packages/linux-firmware/ipw2100-fw/install +++ b/packages/linux-firmware/ipw2100-fw/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/ipw2200-fw/install b/packages/linux-firmware/ipw2200-fw/install index 489c3c2f77..3fdf7ee6c5 100755 --- a/packages/linux-firmware/ipw2200-fw/install +++ b/packages/linux-firmware/ipw2200-fw/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-1000-ucode/install b/packages/linux-firmware/iwlwifi-1000-ucode/install index 489c3c2f77..3fdf7ee6c5 100755 --- a/packages/linux-firmware/iwlwifi-1000-ucode/install +++ b/packages/linux-firmware/iwlwifi-1000-ucode/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-3945-ucode/install b/packages/linux-firmware/iwlwifi-3945-ucode/install index 489c3c2f77..3fdf7ee6c5 100755 --- a/packages/linux-firmware/iwlwifi-3945-ucode/install +++ b/packages/linux-firmware/iwlwifi-3945-ucode/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-4965-ucode/install b/packages/linux-firmware/iwlwifi-4965-ucode/install index 489c3c2f77..3fdf7ee6c5 100755 --- a/packages/linux-firmware/iwlwifi-4965-ucode/install +++ b/packages/linux-firmware/iwlwifi-4965-ucode/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-5000-ucode/install b/packages/linux-firmware/iwlwifi-5000-ucode/install index 489c3c2f77..3fdf7ee6c5 100755 --- a/packages/linux-firmware/iwlwifi-5000-ucode/install +++ b/packages/linux-firmware/iwlwifi-5000-ucode/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-5150-ucode/install b/packages/linux-firmware/iwlwifi-5150-ucode/install index 489c3c2f77..3fdf7ee6c5 100755 --- a/packages/linux-firmware/iwlwifi-5150-ucode/install +++ b/packages/linux-firmware/iwlwifi-5150-ucode/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-6000-ucode/install b/packages/linux-firmware/iwlwifi-6000-ucode/install index 489c3c2f77..3fdf7ee6c5 100755 --- a/packages/linux-firmware/iwlwifi-6000-ucode/install +++ b/packages/linux-firmware/iwlwifi-6000-ucode/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux/build b/packages/linux/build index d1299cf8ad..a803f42b57 100755 --- a/packages/linux/build +++ b/packages/linux/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build module-init-tools diff --git a/packages/linux/install b/packages/linux/install index 91d71ac2ba..80ab2edb70 100755 --- a/packages/linux/install +++ b/packages/linux/install @@ -1,13 +1,12 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build module-init-tools $SCRIPTS/install busybox RAMFS_DRV_SUBSYSTEMS="ata ide scsi" -PKG_DIR=`find $PACKAGES -type d -name $1` VER=`ls $PKG_BUILD/modules/lib/modules` mkdir -p $INSTALL/lib/modules/$VER diff --git a/packages/linux/need_unpack b/packages/linux/need_unpack index 8e4d369236..4f5f0da275 100755 --- a/packages/linux/need_unpack +++ b/packages/linux/need_unpack @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 STAMP=$STAMPS/$1/unpack diff --git a/packages/linux/unpack b/packages/linux/unpack index db6925318a..c9242d4d79 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -1,12 +1,11 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install make $SCRIPTS/install sed LINUX=`ls -d $PKG_BUILD` -PKG_DIR=`find $PACKAGES -type d -name $1` if [ -f $PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf ]; then KERNEL_CFG_FILE=$PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf diff --git a/packages/mediacenter/install b/packages/mediacenter/install index 3dbd24daf4..366d64b6d4 100755 --- a/packages/mediacenter/install +++ b/packages/mediacenter/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 # Base $SCRIPTS/install $MEDIACENTER diff --git a/packages/mediacenter/xbmc-theme-Confluence/install b/packages/mediacenter/xbmc-theme-Confluence/install index e9d1d6b44c..0ef3ec28bb 100755 --- a/packages/mediacenter/xbmc-theme-Confluence/install +++ b/packages/mediacenter/xbmc-theme-Confluence/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/share/xbmc/addons/skin.confluence cp -R $PKG_BUILD/* $INSTALL/usr/share/xbmc/addons/skin.confluence diff --git a/packages/multimedia/SDL/build b/packages/multimedia/SDL/build index b6e9fc6c44..562ff995d4 100755 --- a/packages/multimedia/SDL/build +++ b/packages/multimedia/SDL/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build alsa-lib diff --git a/packages/multimedia/SDL/install b/packages/multimedia/SDL/install index da761ee253..b33650da4a 100755 --- a/packages/multimedia/SDL/install +++ b/packages/multimedia/SDL/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install alsa-lib $SCRIPTS/install libX11 diff --git a/packages/multimedia/SDL_image/build b/packages/multimedia/SDL_image/build index 4fbababae4..ff3dedf0da 100755 --- a/packages/multimedia/SDL_image/build +++ b/packages/multimedia/SDL_image/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build SDL diff --git a/packages/multimedia/SDL_image/install b/packages/multimedia/SDL_image/install index bda6353019..3b9dcc871d 100755 --- a/packages/multimedia/SDL_image/install +++ b/packages/multimedia/SDL_image/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install SDL $SCRIPTS/install $LIBJPEG diff --git a/packages/multimedia/SDL_mixer/build b/packages/multimedia/SDL_mixer/build index 4dc8b58b9d..c47bf5ef24 100755 --- a/packages/multimedia/SDL_mixer/build +++ b/packages/multimedia/SDL_mixer/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build SDL diff --git a/packages/multimedia/SDL_mixer/install b/packages/multimedia/SDL_mixer/install index 231c4f4e93..824deeae29 100755 --- a/packages/multimedia/SDL_mixer/install +++ b/packages/multimedia/SDL_mixer/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install SDL #$SCRIPTS/install flac diff --git a/packages/multimedia/SDL_net/build b/packages/multimedia/SDL_net/build index 68a16ed62a..a908575d56 100755 --- a/packages/multimedia/SDL_net/build +++ b/packages/multimedia/SDL_net/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build SDL diff --git a/packages/multimedia/SDL_net/install b/packages/multimedia/SDL_net/install index efb1e6e8db..5106af385c 100755 --- a/packages/multimedia/SDL_net/install +++ b/packages/multimedia/SDL_net/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install SDL diff --git a/packages/multimedia/SDL_ttf/build b/packages/multimedia/SDL_ttf/build index afdb9a1c90..69ec9db794 100755 --- a/packages/multimedia/SDL_ttf/build +++ b/packages/multimedia/SDL_ttf/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build SDL diff --git a/packages/multimedia/SDL_ttf/install b/packages/multimedia/SDL_ttf/install index 8ca3315e49..67e598571a 100755 --- a/packages/multimedia/SDL_ttf/install +++ b/packages/multimedia/SDL_ttf/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install SDL $SCRIPTS/install libICE diff --git a/packages/multimedia/crystalhd/build b/packages/multimedia/crystalhd/build index c8df55f906..e826cc3b6d 100755 --- a/packages/multimedia/crystalhd/build +++ b/packages/multimedia/crystalhd/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/multimedia/crystalhd/install b/packages/multimedia/crystalhd/install index d00d1cbcb2..abffff1ef9 100755 --- a/packages/multimedia/crystalhd/install +++ b/packages/multimedia/crystalhd/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/lib/firmware cp $PKG_BUILD/firmware/fwbin/*/*.bin $INSTALL/lib/firmware diff --git a/packages/multimedia/libass/build b/packages/multimedia/libass/build index 943febc38c..c9cce4f367 100755 --- a/packages/multimedia/libass/build +++ b/packages/multimedia/libass/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build freetype diff --git a/packages/multimedia/libass/install b/packages/multimedia/libass/install index 2109dc8e19..e5dd9e345b 100755 --- a/packages/multimedia/libass/install +++ b/packages/multimedia/libass/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install freetype $SCRIPTS/install fontconfig diff --git a/packages/multimedia/libmpeg2/build b/packages/multimedia/libmpeg2/build index 288fb825d1..975fe0a351 100755 --- a/packages/multimedia/libmpeg2/build +++ b/packages/multimedia/libmpeg2/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/multimedia/libmpeg2/install b/packages/multimedia/libmpeg2/install index 7edb31f851..4276e56b52 100755 --- a/packages/multimedia/libmpeg2/install +++ b/packages/multimedia/libmpeg2/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/libmpeg2/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/multimedia/libva/build b/packages/multimedia/libva/build index 782a3e5709..e889e0b3b1 100755 --- a/packages/multimedia/libva/build +++ b/packages/multimedia/libva/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libX11 diff --git a/packages/multimedia/libva/install b/packages/multimedia/libva/install index d7f7d8847d..8cbcfc082e 100755 --- a/packages/multimedia/libva/install +++ b/packages/multimedia/libva/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 $SCRIPTS/install libXext diff --git a/packages/multimedia/libvdpau/build b/packages/multimedia/libvdpau/build index 861c537c5e..27c7e6cefd 100755 --- a/packages/multimedia/libvdpau/build +++ b/packages/multimedia/libvdpau/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libX11 diff --git a/packages/multimedia/libvdpau/install b/packages/multimedia/libvdpau/install index e71d974195..cc0480fe46 100755 --- a/packages/multimedia/libvdpau/install +++ b/packages/multimedia/libvdpau/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 [ "$DEVTOOLS" = yes ] && $SCRIPTS/install vdpauinfo diff --git a/packages/multimedia/openal-soft/build b/packages/multimedia/openal-soft/build index 00a23b1aad..aacc589f17 100755 --- a/packages/multimedia/openal-soft/build +++ b/packages/multimedia/openal-soft/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build alsa-lib diff --git a/packages/multimedia/openal-soft/install b/packages/multimedia/openal-soft/install index bd7bba3a39..1f5134cb42 100755 --- a/packages/multimedia/openal-soft/install +++ b/packages/multimedia/openal-soft/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install alsa-lib diff --git a/packages/multimedia/rtmpdump/build b/packages/multimedia/rtmpdump/build index a7d4afc0af..98ac7962a4 100755 --- a/packages/multimedia/rtmpdump/build +++ b/packages/multimedia/rtmpdump/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build zlib $SCRIPTS/build openssl diff --git a/packages/multimedia/vdpauinfo/build b/packages/multimedia/vdpauinfo/build index 7388611e34..4face3f189 100755 --- a/packages/multimedia/vdpauinfo/build +++ b/packages/multimedia/vdpauinfo/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/multimedia/vdpauinfo/install b/packages/multimedia/vdpauinfo/install index b2e8049850..7376a20619 100755 --- a/packages/multimedia/vdpauinfo/install +++ b/packages/multimedia/vdpauinfo/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/network/avahi/build b/packages/network/avahi/build index 9deb68eed5..1bfdb989cd 100755 --- a/packages/network/avahi/build +++ b/packages/network/avahi/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build expat diff --git a/packages/network/avahi/install b/packages/network/avahi/install index 9b7d3c62c3..b3a2d609a3 100755 --- a/packages/network/avahi/install +++ b/packages/network/avahi/install @@ -1,13 +1,11 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install expat $SCRIPTS/install libdaemon $SCRIPTS/install dbus -PKG_DIR=`find $PACKAGES -type d -name $1` - add_user avahi x 495 495 "avahi-daemon" "/var/run/avahi-daemon" "/bin/sh" add_group avahi 495 diff --git a/packages/network/connman/build b/packages/network/connman/build index 6a486aa2b0..314bd32dad 100755 --- a/packages/network/connman/build +++ b/packages/network/connman/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libnl diff --git a/packages/network/connman/install b/packages/network/connman/install index acc791c66f..b51dffd21c 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libnl $SCRIPTS/install dbus @@ -11,8 +11,6 @@ $SCRIPTS/install pygobject #$SCRIPTS/install bluez $SCRIPTS/install wpa_supplicant -PKG_DIR=`find $PACKAGES -type d -name $1` - add_user system x 430 430 "service" "/var/run/connman" "/bin/sh" add_group system 430 diff --git a/packages/network/dropbear/build b/packages/network/dropbear/build index 33c7494ea4..d881d7f47d 100755 --- a/packages/network/dropbear/build +++ b/packages/network/dropbear/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/network/dropbear/install b/packages/network/dropbear/install index f3d26c5eb0..f41b31c639 100755 --- a/packages/network/dropbear/install +++ b/packages/network/dropbear/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib diff --git a/packages/network/install b/packages/network/install index cb0d20108a..c44402096a 100755 --- a/packages/network/install +++ b/packages/network/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install connman $SCRIPTS/install dropbear diff --git a/packages/network/libnl/build b/packages/network/libnl/build index f4aac6e467..f887f8ecc2 100755 --- a/packages/network/libnl/build +++ b/packages/network/libnl/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/network/libnl/install b/packages/network/libnl/install index 673be67cf6..0be753f955 100755 --- a/packages/network/libnl/install +++ b/packages/network/libnl/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/*.so* $INSTALL/usr/lib/ diff --git a/packages/network/libssh/build b/packages/network/libssh/build index 82d9ebef64..820ce25d77 100755 --- a/packages/network/libssh/build +++ b/packages/network/libssh/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/network/libssh/install b/packages/network/libssh/install index 86ed31d8f8..29840b7400 100755 --- a/packages/network/libssh/install +++ b/packages/network/libssh/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib $SCRIPTS/install openssl diff --git a/packages/network/ppp/build b/packages/network/ppp/build index 1c42b198b6..e01daad882 100755 --- a/packages/network/ppp/build +++ b/packages/network/ppp/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/network/ppp/install b/packages/network/ppp/install index 76761815fb..97529c4e3a 100755 --- a/packages/network/ppp/install +++ b/packages/network/ppp/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 mkdir -p $INSTALL/etc/ppp cp $PKG_BUILD/etc.ppp/chap-secrets $INSTALL/etc/ppp/chap-secrets.sample diff --git a/packages/network/samba/build b/packages/network/samba/build index 7351b6c582..6e50266705 100755 --- a/packages/network/samba/build +++ b/packages/network/samba/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/network/samba/install b/packages/network/samba/install index 4e6458cd9b..3c30ca754b 100755 --- a/packages/network/samba/install +++ b/packages/network/samba/install @@ -1,11 +1,9 @@ #!/bin/sh -. config/options +. config/options $1 [ "$AVAHI_DAEMON" = yes ] && $SCRIPTS/install avahi -PKG_DIR=`find $PACKAGES -type d -name $1` - mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/source3/bin/smbtree $INSTALL/usr/bin cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin diff --git a/packages/network/transmission/build b/packages/network/transmission/build index f5d9252226..b3b389e534 100755 --- a/packages/network/transmission/build +++ b/packages/network/transmission/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/network/transmission/install b/packages/network/transmission/install index 9b2949dc61..4e6120a2f1 100755 --- a/packages/network/transmission/install +++ b/packages/network/transmission/install @@ -1,13 +1,11 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build zlib $SCRIPTS/build openssl $SCRIPTS/build curl -PKG_DIR=`find $PACKAGES -type d -name $1` - mkdir -p $INSTALL/usr/sbin cp $PKG_BUILD/daemon/transmission-daemon $INSTALL/usr/sbin diff --git a/packages/network/wicd/build b/packages/network/wicd/build index 59110d1f5c..ff12b31875 100755 --- a/packages/network/wicd/build +++ b/packages/network/wicd/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/network/wicd/install b/packages/network/wicd/install index 8a05230281..cde9156aa6 100755 --- a/packages/network/wicd/install +++ b/packages/network/wicd/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install Python $SCRIPTS/install pygobject diff --git a/packages/network/wireless_tools/build b/packages/network/wireless_tools/build index dd94a6dfa9..94ba8215b1 100755 --- a/packages/network/wireless_tools/build +++ b/packages/network/wireless_tools/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build linux diff --git a/packages/network/wireless_tools/install b/packages/network/wireless_tools/install index 2eecaa8de7..7528e943ae 100755 --- a/packages/network/wireless_tools/install +++ b/packages/network/wireless_tools/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/sbin cp $BUILD/$1*/iwconfig $INSTALL/sbin diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build index a2c8d67b84..38da967275 100755 --- a/packages/network/wpa_supplicant/build +++ b/packages/network/wpa_supplicant/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build dbus diff --git a/packages/network/wpa_supplicant/install b/packages/network/wpa_supplicant/install index aa0e76d685..cc87e06b9c 100755 --- a/packages/network/wpa_supplicant/install +++ b/packages/network/wpa_supplicant/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install dbus diff --git a/packages/network/wpa_supplicant/unpack b/packages/network/wpa_supplicant/unpack index a815f71ae5..27438d7b98 100755 --- a/packages/network/wpa_supplicant/unpack +++ b/packages/network/wpa_supplicant/unpack @@ -1,10 +1,9 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain -PKG_DIR=`find $PACKAGES -type d -name $1` WPA_SUPPLICANT=`ls -d $PKG_BUILD`/wpa_supplicant cp $PKG_DIR/config/makefile.config $WPA_SUPPLICANT/.config diff --git a/packages/other/enca/build b/packages/other/enca/build index d47f5bac3b..79b1bf9463 100755 --- a/packages/other/enca/build +++ b/packages/other/enca/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/other/enca/install b/packages/other/enca/install index aa32cb72ad..5924367d57 100755 --- a/packages/other/enca/install +++ b/packages/other/enca/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/other/fribidi/build b/packages/other/fribidi/build index 8ed9ff14c6..8caa8aeaca 100755 --- a/packages/other/fribidi/build +++ b/packages/other/fribidi/build @@ -1,11 +1,9 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain -PKG_DIR=`find $PACKAGES -type d -name $1` - cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/other/fribidi/install b/packages/other/fribidi/install index 08ef28858d..8fb846d505 100755 --- a/packages/other/fribidi/install +++ b/packages/other/fribidi/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/other/libIDL-host/build b/packages/other/libIDL-host/build index d257dab9b8..2a6da1f4ae 100755 --- a/packages/other/libIDL-host/build +++ b/packages/other/libIDL-host/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build glib-host diff --git a/packages/other/libIDL/build b/packages/other/libIDL/build index d7579875af..9cdd76be28 100755 --- a/packages/other/libIDL/build +++ b/packages/other/libIDL/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build glib diff --git a/packages/other/libIDL/install b/packages/other/libIDL/install index 9b63c689e7..bda1a1af20 100755 --- a/packages/other/libIDL/install +++ b/packages/other/libIDL/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install glib diff --git a/packages/other/libdaemon/build b/packages/other/libdaemon/build index 8547c8b3f5..04dfb735ec 100755 --- a/packages/other/libdaemon/build +++ b/packages/other/libdaemon/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/other/libdaemon/install b/packages/other/libdaemon/install index dce51a02ec..fd547a1173 100755 --- a/packages/other/libdaemon/install +++ b/packages/other/libdaemon/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/$1/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/plugins/SABnzbd/install b/packages/plugins/SABnzbd/install index b8772593f2..31e5722daf 100755 --- a/packages/plugins/SABnzbd/install +++ b/packages/plugins/SABnzbd/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install Cheetah $SCRIPTS/install yenc @@ -10,8 +10,6 @@ $SCRIPTS/install unrar $SCRIPTS/install unzip $SCRIPTS/install par2cmdline -PKG_DIR=`find $PACKAGES -type d -name $1` - mkdir -p $INSTALL/usr/share/$1 cp -P $BUILD/$1*/* $INSTALL/usr/share/$1 diff --git a/packages/plugins/install b/packages/plugins/install index aff1243dfd..0af5900c71 100755 --- a/packages/plugins/install +++ b/packages/plugins/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 for plugin in $XBMC_PLUGINS; do $SCRIPTS/install $plugin diff --git a/packages/print/freetype/build b/packages/print/freetype/build index e4c0752bd2..eb9f269280 100755 --- a/packages/print/freetype/build +++ b/packages/print/freetype/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/print/freetype/install b/packages/print/freetype/install index 2112ed30e2..168de65dfa 100755 --- a/packages/print/freetype/install +++ b/packages/print/freetype/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib diff --git a/packages/python/devel/Cheetah/build b/packages/python/devel/Cheetah/build index 518abb0106..c338b2b40d 100755 --- a/packages/python/devel/Cheetah/build +++ b/packages/python/devel/Cheetah/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/python/devel/Cheetah/install b/packages/python/devel/Cheetah/install index 2c60f5dd1d..daa797322c 100755 --- a/packages/python/devel/Cheetah/install +++ b/packages/python/devel/Cheetah/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install Python diff --git a/packages/python/devel/pygobject/build b/packages/python/devel/pygobject/build index 85c7d90326..3ed83a3d98 100755 --- a/packages/python/devel/pygobject/build +++ b/packages/python/devel/pygobject/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/python/devel/pygobject/install b/packages/python/devel/pygobject/install index 2f138df3b2..18ace73565 100755 --- a/packages/python/devel/pygobject/install +++ b/packages/python/devel/pygobject/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install Python $SCRIPTS/install glib diff --git a/packages/python/security/pyOpenSSL/build b/packages/python/security/pyOpenSSL/build index c5bf869c6a..d18c698a0d 100755 --- a/packages/python/security/pyOpenSSL/build +++ b/packages/python/security/pyOpenSSL/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/python/security/pyOpenSSL/install b/packages/python/security/pyOpenSSL/install index 58043efa77..34d4bd411e 100755 --- a/packages/python/security/pyOpenSSL/install +++ b/packages/python/security/pyOpenSSL/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install Python $SCRIPTS/install openssl diff --git a/packages/python/system/dbus-python/build b/packages/python/system/dbus-python/build index 695c4f4be1..d17aad08e0 100755 --- a/packages/python/system/dbus-python/build +++ b/packages/python/system/dbus-python/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/python/system/dbus-python/install b/packages/python/system/dbus-python/install index efa2a14d1a..852c35b961 100755 --- a/packages/python/system/dbus-python/install +++ b/packages/python/system/dbus-python/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install Python $SCRIPTS/install dbus diff --git a/packages/python/system/yenc/build b/packages/python/system/yenc/build index 518abb0106..c338b2b40d 100755 --- a/packages/python/system/yenc/build +++ b/packages/python/system/yenc/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/python/system/yenc/install b/packages/python/system/yenc/install index 2c60f5dd1d..daa797322c 100755 --- a/packages/python/system/yenc/install +++ b/packages/python/system/yenc/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install Python diff --git a/packages/python/web/feedparser/build b/packages/python/web/feedparser/build index f88dc7cb93..670c515a80 100755 --- a/packages/python/web/feedparser/build +++ b/packages/python/web/feedparser/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/python/web/feedparser/install b/packages/python/web/feedparser/install index 2c60f5dd1d..daa797322c 100755 --- a/packages/python/web/feedparser/install +++ b/packages/python/web/feedparser/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install Python diff --git a/packages/sdk/emulators-sdk/install b/packages/sdk/emulators-sdk/install index ec3e83ef4d..08aa9accb8 100755 --- a/packages/sdk/emulators-sdk/install +++ b/packages/sdk/emulators-sdk/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install SDL $SCRIPTS/install expat diff --git a/packages/sdk/games-sdk/install b/packages/sdk/games-sdk/install index 83eefb0645..8d17d6d98e 100755 --- a/packages/sdk/games-sdk/install +++ b/packages/sdk/games-sdk/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install curl #$SCRIPTS/build lua diff --git a/packages/security/Linux-PAM/build b/packages/security/Linux-PAM/build index 569de1796c..49964314c2 100755 --- a/packages/security/Linux-PAM/build +++ b/packages/security/Linux-PAM/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build flex diff --git a/packages/security/Linux-PAM/install b/packages/security/Linux-PAM/install index d170a06435..1f2a441313 100755 --- a/packages/security/Linux-PAM/install +++ b/packages/security/Linux-PAM/install @@ -1,9 +1,6 @@ #!/bin/sh -. config/options - - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 mkdir -p $INSTALL/etc cp -P $PKG_BUILD/modules/pam_env/environment $INSTALL/etc diff --git a/packages/security/openssl/build b/packages/security/openssl/build index 4551e39549..7dab710388 100755 --- a/packages/security/openssl/build +++ b/packages/security/openssl/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/security/openssl/install b/packages/security/openssl/install index 479c95c6d3..5777d11969 100755 --- a/packages/security/openssl/install +++ b/packages/security/openssl/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib diff --git a/packages/security/polkit/build b/packages/security/polkit/build index 7ed32c8518..f525c6ca9e 100755 --- a/packages/security/polkit/build +++ b/packages/security/polkit/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/security/polkit/install b/packages/security/polkit/install index cac832c755..3045670813 100755 --- a/packages/security/polkit/install +++ b/packages/security/polkit/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib $SCRIPTS/install sg3_utils diff --git a/packages/testing/install b/packages/testing/install index df20ba38a7..dc58028249 100755 --- a/packages/testing/install +++ b/packages/testing/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 # packages needed for development (upcoming features) diff --git a/packages/textproc/expat-host/build b/packages/textproc/expat-host/build index 66c18ac903..55134ea98f 100755 --- a/packages/textproc/expat-host/build +++ b/packages/textproc/expat-host/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/unpack expat diff --git a/packages/textproc/expat/build b/packages/textproc/expat/build index b3d2816c44..ff69b54b73 100755 --- a/packages/textproc/expat/build +++ b/packages/textproc/expat/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/textproc/expat/install b/packages/textproc/expat/install index 356a8dc9fe..11602b5522 100755 --- a/packages/textproc/expat/install +++ b/packages/textproc/expat/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/.build-target/.libs/libexpat.so* $INSTALL/usr/lib diff --git a/packages/textproc/libxml2/build b/packages/textproc/libxml2/build index d0dae65d24..6dc52964c8 100755 --- a/packages/textproc/libxml2/build +++ b/packages/textproc/libxml2/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/textproc/libxml2/install b/packages/textproc/libxml2/install index e8fabc9194..81f9e0234c 100755 --- a/packages/textproc/libxml2/install +++ b/packages/textproc/libxml2/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/.libs/libxml2*.so* $INSTALL/usr/lib diff --git a/packages/textproc/xerces-c/build b/packages/textproc/xerces-c/build index 033de6e7b8..82c9ce5a24 100755 --- a/packages/textproc/xerces-c/build +++ b/packages/textproc/xerces-c/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build curl diff --git a/packages/textproc/xerces-c/install b/packages/textproc/xerces-c/install index 9b32c868a0..c93415f587 100755 --- a/packages/textproc/xerces-c/install +++ b/packages/textproc/xerces-c/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install curl diff --git a/packages/toolchain/build b/packages/toolchain/build index 9c5b294803..6e96896882 100755 --- a/packages/toolchain/build +++ b/packages/toolchain/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build configtools toolchain diff --git a/packages/toolchain/devel/autotools/autoconf-2.64/build b/packages/toolchain/devel/autotools/autoconf-2.64/build index b583e18ad9..3af52095be 100755 --- a/packages/toolchain/devel/autotools/autoconf-2.64/build +++ b/packages/toolchain/devel/autotools/autoconf-2.64/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build m4 $SCRIPTS/build libtool diff --git a/packages/toolchain/devel/autotools/autoconf/build b/packages/toolchain/devel/autotools/autoconf/build index 4acdc855e3..3bcdadd35f 100755 --- a/packages/toolchain/devel/autotools/autoconf/build +++ b/packages/toolchain/devel/autotools/autoconf/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build m4 $SCRIPTS/build libtool diff --git a/packages/toolchain/devel/autotools/automake/build b/packages/toolchain/devel/autotools/automake/build index 2f04100ec3..55ff28b426 100755 --- a/packages/toolchain/devel/autotools/automake/build +++ b/packages/toolchain/devel/autotools/automake/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build autoconf diff --git a/packages/toolchain/devel/autotools/build b/packages/toolchain/devel/autotools/build index aa5eeea489..1380f5ea78 100755 --- a/packages/toolchain/devel/autotools/build +++ b/packages/toolchain/devel/autotools/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build autoconf-2.64 $SCRIPTS/build automake diff --git a/packages/toolchain/devel/autotools/libtool/build b/packages/toolchain/devel/autotools/libtool/build index d84871b44d..809ee74094 100755 --- a/packages/toolchain/devel/autotools/libtool/build +++ b/packages/toolchain/devel/autotools/libtool/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host diff --git a/packages/toolchain/devel/autotools/m4/build b/packages/toolchain/devel/autotools/m4/build index 45c8f15087..00b7ee0d8b 100755 --- a/packages/toolchain/devel/autotools/m4/build +++ b/packages/toolchain/devel/autotools/m4/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host diff --git a/packages/toolchain/devel/binutils/build b/packages/toolchain/devel/binutils/build index 79679e5b2f..feec1c1c15 100755 --- a/packages/toolchain/devel/binutils/build +++ b/packages/toolchain/devel/binutils/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache $SCRIPTS/install linux-headers diff --git a/packages/toolchain/devel/ccache/build b/packages/toolchain/devel/ccache/build index e57b9159a3..144fd6c4cb 100755 --- a/packages/toolchain/devel/ccache/build +++ b/packages/toolchain/devel/ccache/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install make diff --git a/packages/toolchain/devel/ccache/install b/packages/toolchain/devel/ccache/install index e3615cf957..cca09fad9d 100755 --- a/packages/toolchain/devel/ccache/install +++ b/packages/toolchain/devel/ccache/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -GCC_PKG_DIR=`find $PACKAGES -type d -name gcc` +. config/options $1 make -C $PKG_BUILD install diff --git a/packages/toolchain/devel/cmake/build b/packages/toolchain/devel/cmake/build index af1f9797bb..84ed55218e 100755 --- a/packages/toolchain/devel/cmake/build +++ b/packages/toolchain/devel/cmake/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host diff --git a/packages/toolchain/devel/configtools/build b/packages/toolchain/devel/configtools/build index 059a48cd8e..473feeb26b 100755 --- a/packages/toolchain/devel/configtools/build +++ b/packages/toolchain/devel/configtools/build @@ -1,5 +1,5 @@ #!/bin/sh -. config/options +. config/options $1 $BUILD/$1/config.guess > $HOST_NAME_CACHE diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build index 11a57e26aa..02e0e1ffc7 100755 --- a/packages/toolchain/devel/eglibc/build +++ b/packages/toolchain/devel/eglibc/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache diff --git a/packages/toolchain/devel/eglibc/install b/packages/toolchain/devel/eglibc/install index 562741343b..b0f77ce902 100755 --- a/packages/toolchain/devel/eglibc/install +++ b/packages/toolchain/devel/eglibc/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 mkdir -p $INSTALL/lib cp $PKG_BUILD/objdir-$1/elf/ld*.so.* $INSTALL/lib diff --git a/packages/toolchain/devel/fakeroot/build b/packages/toolchain/devel/fakeroot/build index 8a80124bf8..245acc67c5 100755 --- a/packages/toolchain/devel/fakeroot/build +++ b/packages/toolchain/devel/fakeroot/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host diff --git a/packages/toolchain/devel/intltool/build b/packages/toolchain/devel/intltool/build index 0b3bf48e93..047df6151a 100755 --- a/packages/toolchain/devel/intltool/build +++ b/packages/toolchain/devel/intltool/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host diff --git a/packages/toolchain/devel/jam/build b/packages/toolchain/devel/jam/build index 0479b73903..c73ffa470b 100755 --- a/packages/toolchain/devel/jam/build +++ b/packages/toolchain/devel/jam/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host diff --git a/packages/toolchain/devel/libelf/build b/packages/toolchain/devel/libelf/build index 1eac186143..0eb534773d 100755 --- a/packages/toolchain/devel/libelf/build +++ b/packages/toolchain/devel/libelf/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache diff --git a/packages/toolchain/devel/linux-headers/install b/packages/toolchain/devel/linux-headers/install index bccc035ccd..5f65b102e2 100755 --- a/packages/toolchain/devel/linux-headers/install +++ b/packages/toolchain/devel/linux-headers/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/unpack linux diff --git a/packages/toolchain/devel/make/build b/packages/toolchain/devel/make/build index 1e78596f48..c975a0f84d 100755 --- a/packages/toolchain/devel/make/build +++ b/packages/toolchain/devel/make/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host CC=$LOCAL_CC diff --git a/packages/toolchain/devel/make/install b/packages/toolchain/devel/make/install index a22cb3f058..8409343723 100755 --- a/packages/toolchain/devel/make/install +++ b/packages/toolchain/devel/make/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $ROOT/$TOOLCHAIN/bin cp $PKG_BUILD/$1 $ROOT/$TOOLCHAIN/bin diff --git a/packages/toolchain/devel/make/unpack b/packages/toolchain/devel/make/unpack index dcce4fa4fc..057c199c26 100755 --- a/packages/toolchain/devel/make/unpack +++ b/packages/toolchain/devel/make/unpack @@ -1,5 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/fixconfigtools $PKG_BUILD/config + diff --git a/packages/toolchain/devel/pkg-config/build b/packages/toolchain/devel/pkg-config/build index cf15730ee2..9a729756e3 100755 --- a/packages/toolchain/devel/pkg-config/build +++ b/packages/toolchain/devel/pkg-config/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host diff --git a/packages/toolchain/devel/pkg-config/install b/packages/toolchain/devel/pkg-config/install index 54ec9724f5..42ab2e954e 100755 --- a/packages/toolchain/devel/pkg-config/install +++ b/packages/toolchain/devel/pkg-config/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $ROOT/$TOOLCHAIN/bin cp $PKG_BUILD/$1 $ROOT/$TOOLCHAIN/bin diff --git a/packages/toolchain/lang/gcc-core/build b/packages/toolchain/lang/gcc-core/build index 00544ec3f5..0dcbb3e23a 100755 --- a/packages/toolchain/lang/gcc-core/build +++ b/packages/toolchain/lang/gcc-core/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache $SCRIPTS/build binutils diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build index cc563577da..bb0d4442ce 100755 --- a/packages/toolchain/lang/gcc-final/build +++ b/packages/toolchain/lang/gcc-final/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build binutils $SCRIPTS/build gmp diff --git a/packages/toolchain/lang/gcc-final/install b/packages/toolchain/lang/gcc-final/install index 02ca424fdf..23183e19b4 100755 --- a/packages/toolchain/lang/gcc-final/install +++ b/packages/toolchain/lang/gcc-final/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $BUILD/gcc*/objdir-$1*/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib diff --git a/packages/toolchain/lang/gcc/unpack b/packages/toolchain/lang/gcc/unpack index b41aa9cd53..2470ca522c 100755 --- a/packages/toolchain/lang/gcc/unpack +++ b/packages/toolchain/lang/gcc/unpack @@ -1,5 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/fixconfigtools $PKG_BUILD/gcc + diff --git a/packages/toolchain/lang/yasm/build b/packages/toolchain/lang/yasm/build index b77505c235..ff114e7f87 100755 --- a/packages/toolchain/lang/yasm/build +++ b/packages/toolchain/lang/yasm/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 setup_toolchain host diff --git a/packages/toolchain/math/cloog-ppl/build b/packages/toolchain/math/cloog-ppl/build index c134b7f4d4..b1411c9cc9 100755 --- a/packages/toolchain/math/cloog-ppl/build +++ b/packages/toolchain/math/cloog-ppl/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache $SCRIPTS/build gmp diff --git a/packages/toolchain/math/cloog-ppl/unpack b/packages/toolchain/math/cloog-ppl/unpack index 1f7c69c57e..8f42249bcb 100755 --- a/packages/toolchain/math/cloog-ppl/unpack +++ b/packages/toolchain/math/cloog-ppl/unpack @@ -1,5 +1,5 @@ #!/bin/sh -. config/options +. config/options $1 sed -i "/LD_LIBRARY_PATH=/d" $BUILD/$1*/configure diff --git a/packages/toolchain/math/gmp/build b/packages/toolchain/math/gmp/build index 4841578946..6e4af44f9e 100755 --- a/packages/toolchain/math/gmp/build +++ b/packages/toolchain/math/gmp/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache diff --git a/packages/toolchain/math/mpc/build b/packages/toolchain/math/mpc/build index 2e7fd960dc..d892eb088d 100755 --- a/packages/toolchain/math/mpc/build +++ b/packages/toolchain/math/mpc/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache $SCRIPTS/build gmp diff --git a/packages/toolchain/math/mpfr/build b/packages/toolchain/math/mpfr/build index 444e715df2..0450ef8817 100755 --- a/packages/toolchain/math/mpfr/build +++ b/packages/toolchain/math/mpfr/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache $SCRIPTS/build gmp diff --git a/packages/toolchain/math/ppl/build b/packages/toolchain/math/ppl/build index 1c9c2b859c..8912f188e1 100755 --- a/packages/toolchain/math/ppl/build +++ b/packages/toolchain/math/ppl/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache $SCRIPTS/build gmp diff --git a/packages/toolchain/sed/build b/packages/toolchain/sed/build index cf1c0e387b..ced5964f48 100755 --- a/packages/toolchain/sed/build +++ b/packages/toolchain/sed/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ccache diff --git a/packages/toolchain/sed/install b/packages/toolchain/sed/install index c2f5386dda..0d16970743 100755 --- a/packages/toolchain/sed/install +++ b/packages/toolchain/sed/install @@ -1,5 +1,5 @@ #!/bin/sh -. config/options +. config/options $1 make -C $PKG_BUILD/$1 install diff --git a/packages/toolchain/sed/unpack b/packages/toolchain/sed/unpack index dcce4fa4fc..057c199c26 100755 --- a/packages/toolchain/sed/unpack +++ b/packages/toolchain/sed/unpack @@ -1,5 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/fixconfigtools $PKG_BUILD/config + diff --git a/packages/toolchain/sysutils/squashfs/build b/packages/toolchain/sysutils/squashfs/build index 18b42c34e3..94ce8827f1 100755 --- a/packages/toolchain/sysutils/squashfs/build +++ b/packages/toolchain/sysutils/squashfs/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/unpack lzma diff --git a/packages/toolchain/sysutils/squashfs/install b/packages/toolchain/sysutils/squashfs/install index 6d96198155..40df218cf0 100755 --- a/packages/toolchain/sysutils/squashfs/install +++ b/packages/toolchain/sysutils/squashfs/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $ROOT/$TOOLCHAIN/bin cp -rf $BUILD/$1*/squashfs-tools/mksquashfs $ROOT/$TOOLCHAIN/bin diff --git a/packages/tools/autoupdate/install b/packages/tools/autoupdate/install index 685ed7088f..c3758e9660 100755 --- a/packages/tools/autoupdate/install +++ b/packages/tools/autoupdate/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 mkdir -p $INSTALL/usr/bin if [ "$DEVTOOLS" = "yes" ]; then diff --git a/packages/tools/bc/build b/packages/tools/bc/build index f076a13a1a..8ef42daee2 100755 --- a/packages/tools/bc/build +++ b/packages/tools/bc/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/tools/bc/install b/packages/tools/bc/install index f4987d714e..536608a250 100755 --- a/packages/tools/bc/install +++ b/packages/tools/bc/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/bc/bc $INSTALL/usr/bin diff --git a/packages/tools/dialog/build b/packages/tools/dialog/build index 3cc450715a..36860f5c7e 100755 --- a/packages/tools/dialog/build +++ b/packages/tools/dialog/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build ncurses diff --git a/packages/tools/dialog/install b/packages/tools/dialog/install index 7ed797fc11..1663879f1b 100755 --- a/packages/tools/dialog/install +++ b/packages/tools/dialog/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install ncurses diff --git a/packages/tools/e2fsprogs/build b/packages/tools/e2fsprogs/build index d05443f5a0..de6c6aed76 100755 --- a/packages/tools/e2fsprogs/build +++ b/packages/tools/e2fsprogs/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build util-linux-ng diff --git a/packages/tools/e2fsprogs/install b/packages/tools/e2fsprogs/install index 3bb6db3413..de07743e0b 100755 --- a/packages/tools/e2fsprogs/install +++ b/packages/tools/e2fsprogs/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install util-linux-ng diff --git a/packages/tools/flashrom/build b/packages/tools/flashrom/build index f4ae3cd546..606d459d27 100755 --- a/packages/tools/flashrom/build +++ b/packages/tools/flashrom/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/tools/flashrom/install b/packages/tools/flashrom/install index ca3647589b..35e6ccce25 100755 --- a/packages/tools/flashrom/install +++ b/packages/tools/flashrom/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib $SCRIPTS/install pciutils diff --git a/packages/tools/installer/install b/packages/tools/installer/install index 714db55624..61c8ad5dd3 100755 --- a/packages/tools/installer/install +++ b/packages/tools/installer/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install busybox $SCRIPTS/install bash @@ -11,8 +11,6 @@ $SCRIPTS/install e2fsprogs $SCRIPTS/install syslinux $SCRIPTS/install flashrom -PKG_DIR=`find $PACKAGES -type d -name $1` - mkdir -p $INSTALL/usr/bin cp $PKG_DIR/scripts/installer $INSTALL/usr/bin diff --git a/packages/tools/syslinux/build b/packages/tools/syslinux/build index c1e153137e..046206dd6e 100755 --- a/packages/tools/syslinux/build +++ b/packages/tools/syslinux/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/tools/syslinux/install b/packages/tools/syslinux/install index 8583823854..7774a3f99b 100755 --- a/packages/tools/syslinux/install +++ b/packages/tools/syslinux/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/extlinux/extlinux $INSTALL/usr/bin diff --git a/packages/web/curl/build b/packages/web/curl/build index b2f303c2e1..14cb7b9f33 100755 --- a/packages/web/curl/build +++ b/packages/web/curl/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/web/curl/install b/packages/web/curl/install index 27aad0c33f..cda1621f31 100755 --- a/packages/web/curl/install +++ b/packages/web/curl/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib $SCRIPTS/install openssl diff --git a/packages/web/libmicrohttpd/build b/packages/web/libmicrohttpd/build index cb924384af..826d8d1b09 100755 --- a/packages/web/libmicrohttpd/build +++ b/packages/web/libmicrohttpd/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/web/libmicrohttpd/install b/packages/web/libmicrohttpd/install index 7e5d0c41de..7cc66a3bd8 100755 --- a/packages/web/libmicrohttpd/install +++ b/packages/web/libmicrohttpd/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/src/daemon/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/x11/app/xkbcomp/build b/packages/x11/app/xkbcomp/build index 3e93f14a8b..533f82c0d2 100755 --- a/packages/x11/app/xkbcomp/build +++ b/packages/x11/app/xkbcomp/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libX11 diff --git a/packages/x11/app/xkbcomp/install b/packages/x11/app/xkbcomp/install index adeb10212a..2d44eb6077 100755 --- a/packages/x11/app/xkbcomp/install +++ b/packages/x11/app/xkbcomp/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/bin diff --git a/packages/x11/app/xrandr/build b/packages/x11/app/xrandr/build index 9c6e2c1a54..df62558a3f 100755 --- a/packages/x11/app/xrandr/build +++ b/packages/x11/app/xrandr/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libXrandr diff --git a/packages/x11/app/xrandr/install b/packages/x11/app/xrandr/install index 5b697bc303..2692fc1ef8 100755 --- a/packages/x11/app/xrandr/install +++ b/packages/x11/app/xrandr/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libXrandr mkdir -p $INSTALL/usr/bin diff --git a/packages/x11/app/xwd/build b/packages/x11/app/xwd/build index cfc1790b5c..4aff6c09ee 100755 --- a/packages/x11/app/xwd/build +++ b/packages/x11/app/xwd/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/app/xwd/install b/packages/x11/app/xwd/install index a23f46fc41..563ff0dd6c 100755 --- a/packages/x11/app/xwd/install +++ b/packages/x11/app/xwd/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 mkdir -p $INSTALL/usr/bin cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build index 4fd8de7fe8..87b3c622b9 100755 --- a/packages/x11/data/xkeyboard-config/build +++ b/packages/x11/data/xkeyboard-config/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build xkbcomp diff --git a/packages/x11/data/xkeyboard-config/install b/packages/x11/data/xkeyboard-config/install index c0a437425d..a08aecbedc 100755 --- a/packages/x11/data/xkeyboard-config/install +++ b/packages/x11/data/xkeyboard-config/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/$XORG_PATH_XKB cp -R $PKG_BUILD/.install/$XORG_PATH_XKB/* $INSTALL/$XORG_PATH_XKB diff --git a/packages/x11/driver/xf86-input-evdev/build b/packages/x11/driver/xf86-input-evdev/build index 2d316804fb..7e1ce08367 100755 --- a/packages/x11/driver/xf86-input-evdev/build +++ b/packages/x11/driver/xf86-input-evdev/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/driver/xf86-input-evdev/install b/packages/x11/driver/xf86-input-evdev/install index 08c12c682c..72b8357424 100755 --- a/packages/x11/driver/xf86-input-evdev/install +++ b/packages/x11/driver/xf86-input-evdev/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/$XORG_PATH_MODULES/input cp -P $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input diff --git a/packages/x11/driver/xf86-input-synaptics/build b/packages/x11/driver/xf86-input-synaptics/build index 24c0acbacc..7ac1c8b278 100755 --- a/packages/x11/driver/xf86-input-synaptics/build +++ b/packages/x11/driver/xf86-input-synaptics/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libXi diff --git a/packages/x11/driver/xf86-input-synaptics/install b/packages/x11/driver/xf86-input-synaptics/install index b70b8b3f4f..5b4008c9d9 100755 --- a/packages/x11/driver/xf86-input-synaptics/install +++ b/packages/x11/driver/xf86-input-synaptics/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libXi diff --git a/packages/x11/driver/xf86-input-wacom/build b/packages/x11/driver/xf86-input-wacom/build index 2d316804fb..7e1ce08367 100755 --- a/packages/x11/driver/xf86-input-wacom/build +++ b/packages/x11/driver/xf86-input-wacom/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/driver/xf86-input-wacom/install b/packages/x11/driver/xf86-input-wacom/install index 686dd7b685..7d71919838 100755 --- a/packages/x11/driver/xf86-input-wacom/install +++ b/packages/x11/driver/xf86-input-wacom/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 mkdir -p $INSTALL/$XORG_PATH_MODULES/input cp -P $PKG_BUILD/src/.libs/wacom_drv.so $INSTALL/$XORG_PATH_MODULES/input diff --git a/packages/x11/driver/xf86-video-ati/build b/packages/x11/driver/xf86-video-ati/build index 0e73fdeeb1..8cf8463b61 100755 --- a/packages/x11/driver/xf86-video-ati/build +++ b/packages/x11/driver/xf86-video-ati/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build util-macros diff --git a/packages/x11/driver/xf86-video-ati/install b/packages/x11/driver/xf86-video-ati/install index b73a053ed8..fd9d6f644a 100755 --- a/packages/x11/driver/xf86-video-ati/install +++ b/packages/x11/driver/xf86-video-ati/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libXrandr $SCRIPTS/install libXrender diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build index ea8e3bad76..be1deff124 100755 --- a/packages/x11/driver/xf86-video-intel/build +++ b/packages/x11/driver/xf86-video-intel/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build util-macros diff --git a/packages/x11/driver/xf86-video-intel/install b/packages/x11/driver/xf86-video-intel/install index 5b93d4ee52..0f9f6f439a 100755 --- a/packages/x11/driver/xf86-video-intel/install +++ b/packages/x11/driver/xf86-video-intel/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install udev diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/build b/packages/x11/driver/xf86-video-nvidia-legacy/build index 02bf15ff30..24f1e4e4bd 100755 --- a/packages/x11/driver/xf86-video-nvidia-legacy/build +++ b/packages/x11/driver/xf86-video-nvidia-legacy/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build linux diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/install b/packages/x11/driver/xf86-video-nvidia-legacy/install index 18b08d01b0..bd6be4a364 100755 --- a/packages/x11/driver/xf86-video-nvidia-legacy/install +++ b/packages/x11/driver/xf86-video-nvidia-legacy/install @@ -1,12 +1,11 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build module-init-tools $SCRIPTS/install linux $SCRIPTS/install libXinerama -PKG_DIR=`find $PACKAGES -type d -name $1` VER=`ls $BUILD/linux*/modules/lib/modules` mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/need_unpack b/packages/x11/driver/xf86-video-nvidia-legacy/need_unpack index 8be9db1963..bfae889a4c 100755 --- a/packages/x11/driver/xf86-video-nvidia-legacy/need_unpack +++ b/packages/x11/driver/xf86-video-nvidia-legacy/need_unpack @@ -1,8 +1,7 @@ #!/bin/sh -. config/options +. config/options $1 -PKG_DIR=`find $PACKAGES -type d -name $1` STAMP=$STAMPS/$1/unpack test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \ diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/unpack b/packages/x11/driver/xf86-video-nvidia-legacy/unpack index 8839d94045..2c7d1a6633 100755 --- a/packages/x11/driver/xf86-video-nvidia-legacy/unpack +++ b/packages/x11/driver/xf86-video-nvidia-legacy/unpack @@ -1,11 +1,9 @@ #!/bin/sh -. config/options +. config/options $1 require_eglibc $1 -PKG_DIR=`find $PACKAGES -type d -name $1` - NV_ARCH=x86 [ "$TARGET_ARCH" = x86_64 ] && NV_ARCH=x86_64 diff --git a/packages/x11/driver/xf86-video-nvidia/build b/packages/x11/driver/xf86-video-nvidia/build index d932a9faea..cf7e9a9cdf 100755 --- a/packages/x11/driver/xf86-video-nvidia/build +++ b/packages/x11/driver/xf86-video-nvidia/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build linux diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install index 17e9ab2950..c9182129b7 100755 --- a/packages/x11/driver/xf86-video-nvidia/install +++ b/packages/x11/driver/xf86-video-nvidia/install @@ -1,12 +1,11 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build module-init-tools $SCRIPTS/install linux $SCRIPTS/install libXinerama -PKG_DIR=`find $PACKAGES -type d -name $1` VER=`ls $BUILD/linux*/modules/lib/modules` mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers diff --git a/packages/x11/driver/xf86-video-nvidia/need_unpack b/packages/x11/driver/xf86-video-nvidia/need_unpack index 8be9db1963..bfae889a4c 100755 --- a/packages/x11/driver/xf86-video-nvidia/need_unpack +++ b/packages/x11/driver/xf86-video-nvidia/need_unpack @@ -1,8 +1,7 @@ #!/bin/sh -. config/options +. config/options $1 -PKG_DIR=`find $PACKAGES -type d -name $1` STAMP=$STAMPS/$1/unpack test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \ diff --git a/packages/x11/driver/xf86-video-nvidia/unpack b/packages/x11/driver/xf86-video-nvidia/unpack index 8839d94045..2c7d1a6633 100755 --- a/packages/x11/driver/xf86-video-nvidia/unpack +++ b/packages/x11/driver/xf86-video-nvidia/unpack @@ -1,11 +1,9 @@ #!/bin/sh -. config/options +. config/options $1 require_eglibc $1 -PKG_DIR=`find $PACKAGES -type d -name $1` - NV_ARCH=x86 [ "$TARGET_ARCH" = x86_64 ] && NV_ARCH=x86_64 diff --git a/packages/x11/font/encodings/build b/packages/x11/font/encodings/build index bb2422d78d..c4f658d81c 100755 --- a/packages/x11/font/encodings/build +++ b/packages/x11/font/encodings/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/font/encodings/install b/packages/x11/font/encodings/install index 8a52df82cc..05bf6f3e04 100755 --- a/packages/x11/font/encodings/install +++ b/packages/x11/font/encodings/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/$XORG_PATH_ENCODINGS cp $PKG_BUILD/*.enc $INSTALL/$XORG_PATH_ENCODINGS diff --git a/packages/x11/font/font-bitstream-type1/build b/packages/x11/font/font-bitstream-type1/build index a83f1d422f..eb1cf414d1 100755 --- a/packages/x11/font/font-bitstream-type1/build +++ b/packages/x11/font/font-bitstream-type1/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/font/font-bitstream-type1/install b/packages/x11/font/font-bitstream-type1/install index 62338d0ac9..177c5d2709 100755 --- a/packages/x11/font/font-bitstream-type1/install +++ b/packages/x11/font/font-bitstream-type1/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/$XORG_PATH_FONTS/Type1 cp $PKG_BUILD/fonts/* $INSTALL/$XORG_PATH_FONTS/Type1 diff --git a/packages/x11/font/font-cursor-misc/build b/packages/x11/font/font-cursor-misc/build index 2f9fa1d650..ad8d7c5406 100755 --- a/packages/x11/font/font-cursor-misc/build +++ b/packages/x11/font/font-cursor-misc/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build font-util diff --git a/packages/x11/font/font-cursor-misc/install b/packages/x11/font/font-cursor-misc/install index 0f5b4f808f..1e5d23e1cd 100755 --- a/packages/x11/font/font-cursor-misc/install +++ b/packages/x11/font/font-cursor-misc/install @@ -1,4 +1,4 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install font-util diff --git a/packages/x11/font/font-misc-misc/build b/packages/x11/font/font-misc-misc/build index 1783888ba1..ba36ef0510 100755 --- a/packages/x11/font/font-misc-misc/build +++ b/packages/x11/font/font-misc-misc/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build font-cursor-misc diff --git a/packages/x11/font/font-misc-misc/install b/packages/x11/font/font-misc-misc/install index 4daf62977a..ba1ab99ddc 100755 --- a/packages/x11/font/font-misc-misc/install +++ b/packages/x11/font/font-misc-misc/install @@ -1,12 +1,10 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install font-cursor-misc $SCRIPTS/install font-util -PKG_DIR=`find $PACKAGES -type d -name $1` - mkdir -p $INSTALL/$XORG_PATH_FONTS/misc cp $PKG_BUILD/fonts/* $INSTALL/$XORG_PATH_FONTS/misc cp $PKG_DIR/config/fonts.alias $INSTALL/$XORG_PATH_FONTS/misc diff --git a/packages/x11/font/font-util/build b/packages/x11/font/font-util/build index 70ab69c9a8..500cc6f8bc 100755 --- a/packages/x11/font/font-util/build +++ b/packages/x11/font/font-util/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/font/font-util/install b/packages/x11/font/font-util/install index 68ee70ede5..55d65a84c3 100755 --- a/packages/x11/font/font-util/install +++ b/packages/x11/font/font-util/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/$XORG_PATH_MAPS cp $PKG_BUILD/map-* $INSTALL/$XORG_PATH_MAPS diff --git a/packages/x11/font/font-xfree86-type1/build b/packages/x11/font/font-xfree86-type1/build index 96fc51f967..93157cf2bd 100755 --- a/packages/x11/font/font-xfree86-type1/build +++ b/packages/x11/font/font-xfree86-type1/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/font/font-xfree86-type1/install b/packages/x11/font/font-xfree86-type1/install index 987495ce25..94cb6e70cb 100755 --- a/packages/x11/font/font-xfree86-type1/install +++ b/packages/x11/font/font-xfree86-type1/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/$XORG_PATH_FONTS cp $PKG_BUILD/cursor.pfa $INSTALL/$XORG_PATH_FONTS diff --git a/packages/x11/font/liberation-fonts/build b/packages/x11/font/liberation-fonts/build index a7f8152a32..12275f901e 100755 --- a/packages/x11/font/liberation-fonts/build +++ b/packages/x11/font/liberation-fonts/build @@ -1,5 +1,5 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/font/liberation-fonts/install b/packages/x11/font/liberation-fonts/install index 77b95f5edf..729a5774ce 100755 --- a/packages/x11/font/liberation-fonts/install +++ b/packages/x11/font/liberation-fonts/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/share/fonts/liberation cp -PR $PKG_BUILD/*.ttf $INSTALL/usr/share/fonts/liberation diff --git a/packages/x11/lib/libICE/build b/packages/x11/lib/libICE/build index b58de2de47..21aacd8e3a 100755 --- a/packages/x11/lib/libICE/build +++ b/packages/x11/lib/libICE/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build xtrans diff --git a/packages/x11/lib/libICE/install b/packages/x11/lib/libICE/install index 2df4bf5403..a7274b2c80 100755 --- a/packages/x11/lib/libICE/install +++ b/packages/x11/lib/libICE/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libSM/build b/packages/x11/lib/libSM/build index f29e9bc638..bd2676537f 100755 --- a/packages/x11/lib/libSM/build +++ b/packages/x11/lib/libSM/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build util-linux-ng diff --git a/packages/x11/lib/libSM/install b/packages/x11/lib/libSM/install index 650da5dadc..87cdcae0eb 100755 --- a/packages/x11/lib/libSM/install +++ b/packages/x11/lib/libSM/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install util-linux-ng $SCRIPTS/install libICE diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build index b363bd8d89..67cb6e1e7b 100755 --- a/packages/x11/lib/libX11/build +++ b/packages/x11/lib/libX11/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build xextproto diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install index e143745bf0..0860d08a7c 100755 --- a/packages/x11/lib/libX11/install +++ b/packages/x11/lib/libX11/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libXau $SCRIPTS/install libxcb diff --git a/packages/x11/lib/libXau/build b/packages/x11/lib/libXau/build index 3454751ab9..524e98fd00 100755 --- a/packages/x11/lib/libXau/build +++ b/packages/x11/lib/libXau/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build xproto diff --git a/packages/x11/lib/libXau/install b/packages/x11/lib/libXau/install index bfa813b8eb..72c6df79ed 100755 --- a/packages/x11/lib/libXau/install +++ b/packages/x11/lib/libXau/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/.libs/libXau.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXdamage/build b/packages/x11/lib/libXdamage/build index 13f4611cf2..f7cb5bcb09 100755 --- a/packages/x11/lib/libXdamage/build +++ b/packages/x11/lib/libXdamage/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build damageproto diff --git a/packages/x11/lib/libXdamage/install b/packages/x11/lib/libXdamage/install index f3dadd3a78..9b9ef36bc0 100755 --- a/packages/x11/lib/libXdamage/install +++ b/packages/x11/lib/libXdamage/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 $SCRIPTS/install libXfixes diff --git a/packages/x11/lib/libXext/build b/packages/x11/lib/libXext/build index 96024c9ef0..8c72798f19 100755 --- a/packages/x11/lib/libXext/build +++ b/packages/x11/lib/libXext/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libX11 diff --git a/packages/x11/lib/libXext/install b/packages/x11/lib/libXext/install index 6c9ba9cf2a..02654dc2e2 100755 --- a/packages/x11/lib/libXext/install +++ b/packages/x11/lib/libXext/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 diff --git a/packages/x11/lib/libXfixes/build b/packages/x11/lib/libXfixes/build index 7b48b3e5f9..97b0cdf440 100755 --- a/packages/x11/lib/libXfixes/build +++ b/packages/x11/lib/libXfixes/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build fixesproto diff --git a/packages/x11/lib/libXfixes/install b/packages/x11/lib/libXfixes/install index 5581b2ca47..e2f9135499 100755 --- a/packages/x11/lib/libXfixes/install +++ b/packages/x11/lib/libXfixes/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 diff --git a/packages/x11/lib/libXfont/build b/packages/x11/lib/libXfont/build index 19cc18e771..1a67a942f9 100755 --- a/packages/x11/lib/libXfont/build +++ b/packages/x11/lib/libXfont/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build fontcacheproto diff --git a/packages/x11/lib/libXfont/install b/packages/x11/lib/libXfont/install index 3f6bab1da6..638cbf9bcd 100755 --- a/packages/x11/lib/libXfont/install +++ b/packages/x11/lib/libXfont/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install freetype diff --git a/packages/x11/lib/libXft/build b/packages/x11/lib/libXft/build index 3ef68605e6..103b4bb18d 100755 --- a/packages/x11/lib/libXft/build +++ b/packages/x11/lib/libXft/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build fontconfig diff --git a/packages/x11/lib/libXft/install b/packages/x11/lib/libXft/install index 82f200da33..3320781a45 100755 --- a/packages/x11/lib/libXft/install +++ b/packages/x11/lib/libXft/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install fontconfig $SCRIPTS/install freetype diff --git a/packages/x11/lib/libXi/build b/packages/x11/lib/libXi/build index c5677628ab..4e909f88d1 100755 --- a/packages/x11/lib/libXi/build +++ b/packages/x11/lib/libXi/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libX11 diff --git a/packages/x11/lib/libXi/install b/packages/x11/lib/libXi/install index 250a43f4d9..6b4feb8845 100755 --- a/packages/x11/lib/libXi/install +++ b/packages/x11/lib/libXi/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 diff --git a/packages/x11/lib/libXinerama/build b/packages/x11/lib/libXinerama/build index 52252950d6..63ab168a12 100755 --- a/packages/x11/lib/libXinerama/build +++ b/packages/x11/lib/libXinerama/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build xineramaproto diff --git a/packages/x11/lib/libXinerama/install b/packages/x11/lib/libXinerama/install index 8e76a6ee4c..59a735032f 100755 --- a/packages/x11/lib/libXinerama/install +++ b/packages/x11/lib/libXinerama/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/src/.libs/libXinerama.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXmu/build b/packages/x11/lib/libXmu/build index f5a91dac93..5c39bf9dc8 100755 --- a/packages/x11/lib/libXmu/build +++ b/packages/x11/lib/libXmu/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build xextproto diff --git a/packages/x11/lib/libXmu/install b/packages/x11/lib/libXmu/install index 4ea330f087..86aab431b2 100755 --- a/packages/x11/lib/libXmu/install +++ b/packages/x11/lib/libXmu/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 $SCRIPTS/install libXext diff --git a/packages/x11/lib/libXrandr/build b/packages/x11/lib/libXrandr/build index 2a5e5a36dd..ba5897ebae 100755 --- a/packages/x11/lib/libXrandr/build +++ b/packages/x11/lib/libXrandr/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build randrproto diff --git a/packages/x11/lib/libXrandr/install b/packages/x11/lib/libXrandr/install index 3121dc8841..b3f0846136 100755 --- a/packages/x11/lib/libXrandr/install +++ b/packages/x11/lib/libXrandr/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 $SCRIPTS/install libXrender diff --git a/packages/x11/lib/libXrender/build b/packages/x11/lib/libXrender/build index ac3d3a7bef..d0bbf808ed 100755 --- a/packages/x11/lib/libXrender/build +++ b/packages/x11/lib/libXrender/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build renderproto diff --git a/packages/x11/lib/libXrender/install b/packages/x11/lib/libXrender/install index 80e784a633..014c49cb2b 100755 --- a/packages/x11/lib/libXrender/install +++ b/packages/x11/lib/libXrender/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 diff --git a/packages/x11/lib/libXt/build b/packages/x11/lib/libXt/build index 3e781abedb..a6ff7fb2dc 100755 --- a/packages/x11/lib/libXt/build +++ b/packages/x11/lib/libXt/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libX11 diff --git a/packages/x11/lib/libXt/install b/packages/x11/lib/libXt/install index a0b27d019c..b8a801e70e 100755 --- a/packages/x11/lib/libXt/install +++ b/packages/x11/lib/libXt/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 $SCRIPTS/install libSM diff --git a/packages/x11/lib/libXtst/build b/packages/x11/lib/libXtst/build index 9996af0da9..23ce60bf58 100755 --- a/packages/x11/lib/libXtst/build +++ b/packages/x11/lib/libXtst/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build recordproto diff --git a/packages/x11/lib/libXtst/install b/packages/x11/lib/libXtst/install index 19599ef54a..8b592544eb 100755 --- a/packages/x11/lib/libXtst/install +++ b/packages/x11/lib/libXtst/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libXext $SCRIPTS/install libX11 diff --git a/packages/x11/lib/libXxf86vm/build b/packages/x11/lib/libXxf86vm/build index 5e8a05323a..43b6df3836 100755 --- a/packages/x11/lib/libXxf86vm/build +++ b/packages/x11/lib/libXxf86vm/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build xf86vidmodeproto diff --git a/packages/x11/lib/libXxf86vm/install b/packages/x11/lib/libXxf86vm/install index b3e34cd4f4..784f1a5d4f 100755 --- a/packages/x11/lib/libXxf86vm/install +++ b/packages/x11/lib/libXxf86vm/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libX11 $SCRIPTS/install libXext diff --git a/packages/x11/lib/libfontenc/build b/packages/x11/lib/libfontenc/build index 118e3eed0c..c3d1e8e18c 100755 --- a/packages/x11/lib/libfontenc/build +++ b/packages/x11/lib/libfontenc/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build xproto diff --git a/packages/x11/lib/libpciaccess/build b/packages/x11/lib/libpciaccess/build index 711ab1a6b0..704f726a27 100755 --- a/packages/x11/lib/libpciaccess/build +++ b/packages/x11/lib/libpciaccess/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build zlib diff --git a/packages/x11/lib/libpciaccess/install b/packages/x11/lib/libpciaccess/install index ae63572ec8..41f828e368 100755 --- a/packages/x11/lib/libpciaccess/install +++ b/packages/x11/lib/libpciaccess/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib mkdir -p $INSTALL/usr/lib diff --git a/packages/x11/lib/libpciaccess/url b/packages/x11/lib/libpciaccess/url index a2103ed09b..579ff4373b 100644 --- a/packages/x11/lib/libpciaccess/url +++ b/packages/x11/lib/libpciaccess/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/lib/libpciaccess-0.11.0.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/lib/libpciaccess-0.12.0.tar.bz2 \ No newline at end of file diff --git a/packages/x11/lib/libxcb/build b/packages/x11/lib/libxcb/build index 69f398db65..807bf741fe 100755 --- a/packages/x11/lib/libxcb/build +++ b/packages/x11/lib/libxcb/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/x11/lib/libxcb/install b/packages/x11/lib/libxcb/install index 66ecac6858..222bbd1444 100755 --- a/packages/x11/lib/libxcb/install +++ b/packages/x11/lib/libxcb/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libXau diff --git a/packages/x11/lib/libxkbfile/build b/packages/x11/lib/libxkbfile/build index ca35a34d56..281fde6e5d 100755 --- a/packages/x11/lib/libxkbfile/build +++ b/packages/x11/lib/libxkbfile/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libX11 diff --git a/packages/x11/lib/pixman/build b/packages/x11/lib/pixman/build index 7db09ff6ae..fc3455c64e 100755 --- a/packages/x11/lib/pixman/build +++ b/packages/x11/lib/pixman/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/lib/pixman/install b/packages/x11/lib/pixman/install index 1dc6cd6db3..053b0f99cc 100755 --- a/packages/x11/lib/pixman/install +++ b/packages/x11/lib/pixman/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/pixman/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/xtrans/build b/packages/x11/lib/xtrans/build index bb1f9c7d94..1c065f0b81 100755 --- a/packages/x11/lib/xtrans/build +++ b/packages/x11/lib/xtrans/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/other/fontconfig/build b/packages/x11/other/fontconfig/build index 8c8e54b338..fd91741bcf 100755 --- a/packages/x11/other/fontconfig/build +++ b/packages/x11/other/fontconfig/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build freetype diff --git a/packages/x11/other/fontconfig/install b/packages/x11/other/fontconfig/install index d3da9ef9a1..4021d2c9c4 100755 --- a/packages/x11/other/fontconfig/install +++ b/packages/x11/other/fontconfig/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install zlib $SCRIPTS/install freetype diff --git a/packages/x11/other/ratpoison/build b/packages/x11/other/ratpoison/build index d832e8380e..fce9f19f72 100755 --- a/packages/x11/other/ratpoison/build +++ b/packages/x11/other/ratpoison/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build libXft diff --git a/packages/x11/other/ratpoison/install b/packages/x11/other/ratpoison/install index 2315ef548a..70cb6a60b6 100755 --- a/packages/x11/other/ratpoison/install +++ b/packages/x11/other/ratpoison/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install libXft $SCRIPTS/install libICE @@ -10,8 +10,6 @@ $SCRIPTS/install libXtst $SCRIPTS/install libXinerama $SCRIPTS/install liberation-fonts -PKG_DIR=`find $PACKAGES -type d -name $1` - mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/src/ratpoison $INSTALL/usr/bin diff --git a/packages/x11/proto/bigreqsproto/build b/packages/x11/proto/bigreqsproto/build index 94fa3b5898..7f8e351572 100755 --- a/packages/x11/proto/bigreqsproto/build +++ b/packages/x11/proto/bigreqsproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/damageproto/build b/packages/x11/proto/damageproto/build index ee2f0b3315..cb0bb91ee5 100755 --- a/packages/x11/proto/damageproto/build +++ b/packages/x11/proto/damageproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/dri2proto/build b/packages/x11/proto/dri2proto/build index ee2f0b3315..cb0bb91ee5 100755 --- a/packages/x11/proto/dri2proto/build +++ b/packages/x11/proto/dri2proto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/fixesproto/build b/packages/x11/proto/fixesproto/build index ee2f0b3315..cb0bb91ee5 100755 --- a/packages/x11/proto/fixesproto/build +++ b/packages/x11/proto/fixesproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/fontcacheproto/build b/packages/x11/proto/fontcacheproto/build index ee2f0b3315..cb0bb91ee5 100755 --- a/packages/x11/proto/fontcacheproto/build +++ b/packages/x11/proto/fontcacheproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/fontsproto/build b/packages/x11/proto/fontsproto/build index ee2f0b3315..cb0bb91ee5 100755 --- a/packages/x11/proto/fontsproto/build +++ b/packages/x11/proto/fontsproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/glproto/build b/packages/x11/proto/glproto/build index ee2f0b3315..cb0bb91ee5 100755 --- a/packages/x11/proto/glproto/build +++ b/packages/x11/proto/glproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/inputproto/build b/packages/x11/proto/inputproto/build index ee2f0b3315..cb0bb91ee5 100755 --- a/packages/x11/proto/inputproto/build +++ b/packages/x11/proto/inputproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/kbproto/build b/packages/x11/proto/kbproto/build index ee2f0b3315..cb0bb91ee5 100755 --- a/packages/x11/proto/kbproto/build +++ b/packages/x11/proto/kbproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/randrproto/build b/packages/x11/proto/randrproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/randrproto/build +++ b/packages/x11/proto/randrproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/recordproto/build b/packages/x11/proto/recordproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/recordproto/build +++ b/packages/x11/proto/recordproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/renderproto/build b/packages/x11/proto/renderproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/renderproto/build +++ b/packages/x11/proto/renderproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/scrnsaverproto/build b/packages/x11/proto/scrnsaverproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/scrnsaverproto/build +++ b/packages/x11/proto/scrnsaverproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/videoproto/build b/packages/x11/proto/videoproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/videoproto/build +++ b/packages/x11/proto/videoproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/xcb-proto/build b/packages/x11/proto/xcb-proto/build index 90743ed6d8..c4d9d1a80f 100755 --- a/packages/x11/proto/xcb-proto/build +++ b/packages/x11/proto/xcb-proto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build Python diff --git a/packages/x11/proto/xcmiscproto/build b/packages/x11/proto/xcmiscproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/xcmiscproto/build +++ b/packages/x11/proto/xcmiscproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/xextproto/build b/packages/x11/proto/xextproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/xextproto/build +++ b/packages/x11/proto/xextproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/xf86dgaproto/build b/packages/x11/proto/xf86dgaproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/xf86dgaproto/build +++ b/packages/x11/proto/xf86dgaproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/xf86driproto/build b/packages/x11/proto/xf86driproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/xf86driproto/build +++ b/packages/x11/proto/xf86driproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/xf86miscproto/build b/packages/x11/proto/xf86miscproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/xf86miscproto/build +++ b/packages/x11/proto/xf86miscproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/xf86vidmodeproto/build b/packages/x11/proto/xf86vidmodeproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/xf86vidmodeproto/build +++ b/packages/x11/proto/xf86vidmodeproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/xineramaproto/build b/packages/x11/proto/xineramaproto/build index 61467203fa..1c031ac4c1 100755 --- a/packages/x11/proto/xineramaproto/build +++ b/packages/x11/proto/xineramaproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/proto/xproto/build b/packages/x11/proto/xproto/build index c56cbfa8e0..8eb9858414 100755 --- a/packages/x11/proto/xproto/build +++ b/packages/x11/proto/xproto/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain diff --git a/packages/x11/toolkits/gdk-pixbuf/build b/packages/x11/toolkits/gdk-pixbuf/build index b584f59c54..81baacbb12 100755 --- a/packages/x11/toolkits/gdk-pixbuf/build +++ b/packages/x11/toolkits/gdk-pixbuf/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build glib diff --git a/packages/x11/toolkits/gdk-pixbuf/install b/packages/x11/toolkits/gdk-pixbuf/install index 3cd0353dfb..f92a40193b 100755 --- a/packages/x11/toolkits/gdk-pixbuf/install +++ b/packages/x11/toolkits/gdk-pixbuf/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build glib $SCRIPTS/build tiff @@ -10,7 +10,6 @@ $SCRIPTS/build jasper GDK_BINARY_VERSION=`pkg-config gdk-pixbuf-2.0 --variable=gdk_pixbuf_binary_version` GDK_LIB_DIR="gdk-pixbuf-2.0/$GDK_BINARY_VERSION" -PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/etc/gdk_pixbuf-2.0 cp $PKG_DIR/config/gdk-pixbuf.loaders $INSTALL/etc/gdk_pixbuf-2.0 diff --git a/packages/x11/toolkits/gtk+/build b/packages/x11/toolkits/gtk+/build index a7a8bd2d1e..c35c3ea5b3 100755 --- a/packages/x11/toolkits/gtk+/build +++ b/packages/x11/toolkits/gtk+/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build atk diff --git a/packages/x11/toolkits/gtk+/install b/packages/x11/toolkits/gtk+/install index fb297ceab1..07a76fe47a 100755 --- a/packages/x11/toolkits/gtk+/install +++ b/packages/x11/toolkits/gtk+/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install atk $SCRIPTS/install libX11 @@ -13,7 +13,6 @@ $SCRIPTS/install gdk-pixbuf GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` GTK_LIB_DIR="gtk-2.0/$GTK_BINARY_VERSION" -PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/etc/gtk-2.0 cp $PKG_BUILD/modules/input/im-multipress.conf $INSTALL/etc/gtk-2.0 diff --git a/packages/x11/toolkits/pango/build b/packages/x11/toolkits/pango/build index 176c9b3f99..8d14c00282 100755 --- a/packages/x11/toolkits/pango/build +++ b/packages/x11/toolkits/pango/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/build toolchain $SCRIPTS/build glib diff --git a/packages/x11/toolkits/pango/install b/packages/x11/toolkits/pango/install index 81c98e64da..265ecd4004 100755 --- a/packages/x11/toolkits/pango/install +++ b/packages/x11/toolkits/pango/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 $SCRIPTS/install glib $SCRIPTS/install cairo @@ -10,7 +10,6 @@ $SCRIPTS/install libX11 $SCRIPTS/install libXft MODULE_VERSION=`pkg-config pango --variable=pango_module_version` -PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/$1/.libs/libpango*.so* $INSTALL/usr/lib diff --git a/packages/x11/util/util-macros/build b/packages/x11/util/util-macros/build index 953620ba7e..a81f6395d6 100755 --- a/packages/x11/util/util-macros/build +++ b/packages/x11/util/util-macros/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 cd $PKG_BUILD ./configure --host=$TARGET_NAME \ diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 5d03fb0bdc..052178214a 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 XORG_SRC="$PKG_BUILD/hw/xfree86" diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index c252a80e3d..49a88b3a0c 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -1,6 +1,6 @@ #!/bin/sh -. config/options +. config/options $1 get_graphicdrivers @@ -18,7 +18,6 @@ $SCRIPTS/install udev XORG_SRC="$PKG_BUILD/hw/xfree86" XORG_DST="$INSTALL/$XORG_PATH_MODULES" -PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/bin cp -P $XORG_SRC/Xorg $INSTALL/usr/bin diff --git a/scripts/build b/scripts/build index d976cd1ffc..a1d4fcb435 100755 --- a/scripts/build +++ b/scripts/build @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 if [ -z "$1" ]; then echo "usage: $0 package_name" diff --git a/scripts/clean b/scripts/clean index 7dcd3fe4d6..28b156b56b 100755 --- a/scripts/clean +++ b/scripts/clean @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 clean () { diff --git a/scripts/create_addon b/scripts/create_addon index 82b67c42d3..0ee3abc178 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 if [ -z "$1" ]; then echo "usage: $0 package_name" diff --git a/scripts/extract b/scripts/extract index 96bbfa9c19..d5af3c99b9 100755 --- a/scripts/extract +++ b/scripts/extract @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 if [ -z "$3" ]; then echo "usage: $0 package_name file_pattern target_dir" diff --git a/scripts/get b/scripts/get index e8a7d40202..65e1801a22 100755 --- a/scripts/get +++ b/scripts/get @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 mkdir -p $STAMPS_NOARCH/$1 STAMP=$STAMPS_NOARCH/$1/get diff --git a/scripts/install b/scripts/install index 08c02afff2..c5ea5583e3 100755 --- a/scripts/install +++ b/scripts/install @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 if [ -z "$1" ]; then echo "usage: $0 package_name" diff --git a/scripts/unpack b/scripts/unpack index 21f8a3f588..91b61f9e30 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -1,8 +1,6 @@ #!/bin/sh -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` +. config/options $1 if [ -z "$1" ]; then echo "usage: $0 package_name"