diff --git a/config/path b/config/path index b4a4bf7ef5..f50c2092f8 100644 --- a/config/path +++ b/config/path @@ -16,6 +16,7 @@ SOURCES=sources BUILD_BASE=build BUILD=$BUILD_BASE.OpenELEC.$PROJECT.$TARGET_ARCH.$TARGET_LIBC [ -n "$TARGET_PLATFORM" ] && BUILD=$BUILD.$TARGET_PLATFORM +PKG_BUILD=$BUILD/$1\[-_][0-9\|\\|\]* STAMPS_NOARCH=.stamps STAMPS=$BUILD/$STAMPS_NOARCH DOCS=DOCS diff --git a/packages/accessibility/atk/build b/packages/accessibility/atk/build index ea8793c6bb..709c7cd4c0 100755 --- a/packages/accessibility/atk/build +++ b/packages/accessibility/atk/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build glib -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no glib_cv_uscore=no \ diff --git a/packages/accessibility/atk/install b/packages/accessibility/atk/install index fde0661b22..01c74f03f3 100755 --- a/packages/accessibility/atk/install +++ b/packages/accessibility/atk/install @@ -5,4 +5,4 @@ $SCRIPTS/install glib mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/$1/.libs/libatk*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/$1/.libs/libatk*.so* $INSTALL/usr/lib diff --git a/packages/audio/a52dec/build b/packages/audio/a52dec/build index b80e6cd3e9..e1a77531bc 100755 --- a/packages/audio/a52dec/build +++ b/packages/audio/a52dec/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/a52dec/unpack b/packages/audio/a52dec/unpack index 8e17287753..679b10e81e 100755 --- a/packages/audio/a52dec/unpack +++ b/packages/audio/a52dec/unpack @@ -2,4 +2,4 @@ . config/options -$SCRIPTS/fixconfigtools $BUILD/$1*/autotools +$SCRIPTS/fixconfigtools $PKG_BUILD/autotools diff --git a/packages/audio/alsa-lib/build b/packages/audio/alsa-lib/build index a013dfd4c9..5a31c0a434 100755 --- a/packages/audio/alsa-lib/build +++ b/packages/audio/alsa-lib/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=32 -fPIC -DPIC" -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/audio/alsa-lib/install b/packages/audio/alsa-lib/install index 576f20e809..617e0155bf 100755 --- a/packages/audio/alsa-lib/install +++ b/packages/audio/alsa-lib/install @@ -3,17 +3,17 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libasound.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libasound.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/alsa-lib/smixer -cp -PR $BUILD/$1*/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib/alsa-lib/smixer +cp -PR $PKG_BUILD/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib/alsa-lib/smixer mkdir -p $INSTALL/usr/share/alsa -sed 's%.*~/\.asoundrc.*%%' $BUILD/$1*/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf -cp -PR $BUILD/$1*/src/conf/smixer.conf $INSTALL/usr/share/alsa -cp -PR $BUILD/$1*/src/conf/*.alisp $INSTALL/usr/share/alsa +sed 's%.*~/\.asoundrc.*%%' $PKG_BUILD/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf +cp -PR $PKG_BUILD/src/conf/smixer.conf $INSTALL/usr/share/alsa +cp -PR $PKG_BUILD/src/conf/*.alisp $INSTALL/usr/share/alsa -cp -rf $BUILD/$1*/src/conf/cards $INSTALL/usr/share/alsa/ -cp -rf $BUILD/$1*/src/conf/pcm $INSTALL/usr/share/alsa/ +cp -rf $PKG_BUILD/src/conf/cards $INSTALL/usr/share/alsa/ +cp -rf $PKG_BUILD/src/conf/pcm $INSTALL/usr/share/alsa/ rm -f $INSTALL/usr/share/alsa/cards/Makefile* rm -f $INSTALL/usr/share/alsa/pcm/Makefile* diff --git a/packages/audio/alsa-utils/build b/packages/audio/alsa-utils/build index ef0a08b3f2..71a999eec1 100755 --- a/packages/audio/alsa-utils/build +++ b/packages/audio/alsa-utils/build @@ -14,7 +14,7 @@ ALSATEST_CONFIG="--disable-alsatest" export CPPFLAGS="$CPPFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses" export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/usr/lib64 -L$LIB_PREFIX/lib" -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/alsa-utils/install b/packages/audio/alsa-utils/install index d4e5dbcef5..df26646607 100755 --- a/packages/audio/alsa-utils/install +++ b/packages/audio/alsa-utils/install @@ -7,12 +7,12 @@ $SCRIPTS/install alsa-lib PKG_DIR=`find $PACKAGES -type d -name $1` #mkdir -p $INSTALL/usr/bin -#cp $BUILD/$1*/amixer/amixer $INSTALL/usr/bin +#cp $PKG_BUILD/amixer/amixer $INSTALL/usr/bin mkdir -p $INSTALL/usr/sbin -cp $BUILD/$1*/alsactl/alsactl $INSTALL/usr/sbin +cp $PKG_BUILD/alsactl/alsactl $INSTALL/usr/sbin mkdir -p $INSTALL/usr/share/alsa/init -cp $BUILD/$1*/alsactl/init/* $INSTALL/usr/share/alsa/init +cp $PKG_BUILD/alsactl/init/* $INSTALL/usr/share/alsa/init rm -rf $INSTALL/usr/share/alsa/init/Makefile* mkdir -p $INSTALL/etc/udev/rules.d @@ -22,21 +22,21 @@ mkdir -p $INSTALL/etc cp $PKG_DIR/config/asound.state $INSTALL/etc if [ "$DEVTOOLS" = yes ]; then -# cp $BUILD/$1*/alsaconf/alsaconf $INSTALL/usr/bin +# cp $PKG_BUILD/alsaconf/alsaconf $INSTALL/usr/bin # chmod +x $INSTALL/usr/bin/alsaconf -# cp $BUILD/$1*/alsamixer/alsamixer $INSTALL/usr/bin +# cp $PKG_BUILD/alsamixer/alsamixer $INSTALL/usr/bin - cp $BUILD/$1*/aplay/aplay $INSTALL/usr/bin + cp $PKG_BUILD/aplay/aplay $INSTALL/usr/bin ln -sf /usr/bin/aplay $INSTALL/usr/bin/arecord - cp $BUILD/$1*/iecset/iecset $INSTALL/usr/bin + cp $PKG_BUILD/iecset/iecset $INSTALL/usr/bin -# cp $BUILD/$1*/speaker-test/speaker-test $INSTALL/usr/bin +# cp $PKG_BUILD/speaker-test/speaker-test $INSTALL/usr/bin # mkdir -p $INSTALL/usr/share/alsa/speaker-test -# cp $BUILD/$1*/speaker-test/samples/*.csv $INSTALL/usr/share/alsa/speaker-test +# cp $PKG_BUILD/speaker-test/samples/*.csv $INSTALL/usr/share/alsa/speaker-test # mkdir -p $INSTALL/usr/share/sounds/alsa -# cp $BUILD/$1*/speaker-test/samples/*.wav $INSTALL/usr/share/sounds/alsa +# cp $PKG_BUILD/speaker-test/samples/*.wav $INSTALL/usr/share/sounds/alsa fi exit 0 diff --git a/packages/audio/cdparanoia/build b/packages/audio/cdparanoia/build index 9de2ee5c7d..a1d946c3f9 100755 --- a/packages/audio/cdparanoia/build +++ b/packages/audio/cdparanoia/build @@ -9,7 +9,7 @@ export ac_cv_sizeof_int=4 export ac_cv_sizeof_long=4 export ac_cv_sizeof_long_long=8 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/faac/build b/packages/audio/faac/build index ff5b357fcb..b88f583c91 100755 --- a/packages/audio/faac/build +++ b/packages/audio/faac/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD #./bootstrap ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/audio/faad2/build b/packages/audio/faad2/build index a3f0ce6b75..939ee173e4 100755 --- a/packages/audio/faad2/build +++ b/packages/audio/faad2/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/faad2/unpack b/packages/audio/faad2/unpack index 26c1047cfa..57ff528d8a 100755 --- a/packages/audio/faad2/unpack +++ b/packages/audio/faad2/unpack @@ -2,6 +2,6 @@ . config/options -cp $BUILD/configtools/config.guess $BUILD/$1*/ -cp $BUILD/configtools/config.sub $BUILD/$1*/ -chmod a+x $BUILD/$1*/configure +cp $BUILD/configtools/config.guess $PKG_BUILD/ +cp $BUILD/configtools/config.sub $PKG_BUILD/ +chmod a+x $PKG_BUILD/configure diff --git a/packages/audio/flac/build b/packages/audio/flac/build index 334c9f0b66..87b272d657 100755 --- a/packages/audio/flac/build +++ b/packages/audio/flac/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libogg -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/lame/build b/packages/audio/lame/build index e5db3f479f..c6ccaa9cd5 100755 --- a/packages/audio/lame/build +++ b/packages/audio/lame/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libcdaudio/build b/packages/audio/libcdaudio/build index 7175e35ecf..f33e3d223c 100755 --- a/packages/audio/libcdaudio/build +++ b/packages/audio/libcdaudio/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libcdio/build b/packages/audio/libcdio/build index 5a5f83f8b9..ab19f46d8a 100755 --- a/packages/audio/libcdio/build +++ b/packages/audio/libcdio/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libiconv $SCRIPTS/build ncurses -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libid3tag/build b/packages/audio/libid3tag/build index 7fb0dd67dd..39bfbfd31b 100755 --- a/packages/audio/libid3tag/build +++ b/packages/audio/libid3tag/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libmad/build b/packages/audio/libmad/build index 7fb0dd67dd..39bfbfd31b 100755 --- a/packages/audio/libmad/build +++ b/packages/audio/libmad/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libogg/build b/packages/audio/libogg/build index 1324b84778..e4dcf6bff0 100755 --- a/packages/audio/libogg/build +++ b/packages/audio/libogg/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libogg/install b/packages/audio/libogg/install index 33cb31442e..f559e96c7a 100755 --- a/packages/audio/libogg/install +++ b/packages/audio/libogg/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libogg*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libogg*.so* $INSTALL/usr/lib diff --git a/packages/audio/libshout/build b/packages/audio/libshout/build index 3bd5f124a6..8a9ce5024b 100755 --- a/packages/audio/libshout/build +++ b/packages/audio/libshout/build @@ -9,7 +9,7 @@ $SCRIPTS/build libogg $SCRIPTS/build speex -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libsndfile/build b/packages/audio/libsndfile/build index 463f4973aa..272de8717d 100755 --- a/packages/audio/libsndfile/build +++ b/packages/audio/libsndfile/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build alsa-lib #$SCRIPTS/build flac -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libvorbis/build b/packages/audio/libvorbis/build index f409980f55..bfe2c14f92 100755 --- a/packages/audio/libvorbis/build +++ b/packages/audio/libvorbis/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libogg -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/libvorbis/install b/packages/audio/libvorbis/install index d7d7d4cca1..6fc28f4999 100755 --- a/packages/audio/libvorbis/install +++ b/packages/audio/libvorbis/install @@ -4,5 +4,5 @@ $SCRIPTS/install libogg mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/lib/.libs/libvorbis*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/lib/.libs/libvorbis*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libvorbis*.so*T \ No newline at end of file diff --git a/packages/audio/speex/build b/packages/audio/speex/build index dbdbd26957..69f2c7aa39 100755 --- a/packages/audio/speex/build +++ b/packages/audio/speex/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libogg -cd $BUILD/$1* +cd $PKG_BUILD OGG_CFLAGS="" \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/audio/taglib/build b/packages/audio/taglib/build index 69b3836792..2b4b55f5c9 100755 --- a/packages/audio/taglib/build +++ b/packages/audio/taglib/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build zlib -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/twolame/build b/packages/audio/twolame/build index 75ffcac16e..5791235d96 100755 --- a/packages/audio/twolame/build +++ b/packages/audio/twolame/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain #$SCRIPTS/build libsndfile -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/audio/wavpack/build b/packages/audio/wavpack/build index 16cd69f236..7ab3236be3 100755 --- a/packages/audio/wavpack/build +++ b/packages/audio/wavpack/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/converters/libiconv/build b/packages/converters/libiconv/build index c4c07dd45e..50dd4eaa02 100755 --- a/packages/converters/libiconv/build +++ b/packages/converters/libiconv/build @@ -3,9 +3,9 @@ . config/options $SCRIPTS/build toolchain -$SCRIPTS/build gettext +$SCRIPTS/build gettext-dummy -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -19,4 +19,4 @@ $MAKE $STRIP lib/.libs/*.so* -$MAKEINSTALL \ No newline at end of file +$MAKEINSTALL diff --git a/packages/converters/libiconv/install b/packages/converters/libiconv/install index df5209de77..12d37998cc 100755 --- a/packages/converters/libiconv/install +++ b/packages/converters/libiconv/install @@ -2,7 +2,7 @@ . config/options -$SCRIPTS/install gettext +$SCRIPTS/install gettext-dummy mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/lib/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/databases/sqlite/build b/packages/databases/sqlite/build index 7a26a6030d..67167227cb 100755 --- a/packages/databases/sqlite/build +++ b/packages/databases/sqlite/build @@ -12,7 +12,7 @@ export config_TARGET_LINK="$LD" export config_TARGET_CFLAGS="$CFLAGS" export config_TARGET_LFLAGS="$LDFLAGS -ldl" -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/databases/sqlite/install b/packages/databases/sqlite/install index baa5294397..b44ca0e962 100755 --- a/packages/databases/sqlite/install +++ b/packages/databases/sqlite/install @@ -3,5 +3,5 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib -cp $BUILD/$1*/.libs/sqlite3 $INSTALL/usr/bin +cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib +cp $PKG_BUILD/.libs/sqlite3 $INSTALL/usr/bin diff --git a/packages/devel/dbus-glib/build b/packages/devel/dbus-glib/build index f921d9bf47..658fed4ed1 100755 --- a/packages/devel/dbus-glib/build +++ b/packages/devel/dbus-glib/build @@ -3,12 +3,12 @@ . config/options $SCRIPTS/build toolchain -$SCRIPTS/build gettext +$SCRIPTS/build gettext-dummy $SCRIPTS/build dbus $SCRIPTS/build glib $SCRIPTS/build expat -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_have_abstract_sockets=yes \ ac_cv_func_posix_getpwnam_r=yes \ diff --git a/packages/devel/dbus-glib/install b/packages/devel/dbus-glib/install index 3693997178..b50f45f971 100755 --- a/packages/devel/dbus-glib/install +++ b/packages/devel/dbus-glib/install @@ -5,7 +5,7 @@ $SCRIPTS/install dbus $SCRIPTS/install glib $SCRIPTS/install expat -$SCRIPTS/install gettext +$SCRIPTS/install gettext-dummy mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/dbus/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/dbus/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/devel/dbus/build b/packages/devel/dbus/build index 49f789e2fd..ea2365c095 100755 --- a/packages/devel/dbus/build +++ b/packages/devel/dbus/build @@ -11,7 +11,7 @@ export ac_cv_have_abstract_sockets=set export CFLAGS="$CFLAGS -I$LIB_PREFIX/include" export LDFLAGS="$LDFLAGS -L$LIB_PREFIX/lib" -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/devel/dbus/install b/packages/devel/dbus/install index b2b52363a3..481090babe 100755 --- a/packages/devel/dbus/install +++ b/packages/devel/dbus/install @@ -8,19 +8,19 @@ mkdir -p $INSTALL/usr/share/dbus-1/services mkdir -p $INSTALL/usr/share/dbus-1/system-services mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/bus/dbus-daemon $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/dbus-uuidgen $INSTALL/usr/bin -cp $BUILD/$1*/tools/dbus-launch $INSTALL/usr/bin +cp $PKG_BUILD/bus/dbus-daemon $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/dbus-uuidgen $INSTALL/usr/bin +cp $PKG_BUILD/tools/dbus-launch $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dbus-1.0 -cp $BUILD/$1*/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus-1.0 +cp $PKG_BUILD/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus-1.0 mkdir -p $INSTALL/etc/dbus-1/event.d mkdir -p $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/etc/dbus-1/session.d -cp $BUILD/$1*/bus/session.conf $INSTALL/etc/dbus-1 -sed 's%.*%/usr/lib/dbus-1.0/dbus-daemon-launch-helper%' $BUILD/$1*/bus/system.conf > $INSTALL/etc/dbus-1/system.conf +cp $PKG_BUILD/bus/session.conf $INSTALL/etc/dbus-1 +sed 's%.*%/usr/lib/dbus-1.0/dbus-daemon-launch-helper%' $PKG_BUILD/bus/system.conf > $INSTALL/etc/dbus-1/system.conf diff --git a/packages/devel/gdb/build b/packages/devel/gdb/build index 6eebf38e31..cc9d432a02 100755 --- a/packages/devel/gdb/build +++ b/packages/devel/gdb/build @@ -11,7 +11,7 @@ export ac_cv_libexpat=no export CC_FOR_BUILD="$HOST_CC" export CFLAGS_FOR_BUILD="$HOST_CFLAGS" -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p objdir cd objdir ../configure --host=$TARGET_NAME \ diff --git a/packages/devel/gdb/install b/packages/devel/gdb/install index 6a9310b116..b8b36c32a5 100755 --- a/packages/devel/gdb/install +++ b/packages/devel/gdb/install @@ -2,4 +2,4 @@ . config/options -cp $BUILD/$1*/objdir/$1/$1 $INSTALL/usr/bin +cp $PKG_BUILD/objdir/$1/$1 $INSTALL/usr/bin diff --git a/packages/devel/gettext/build b/packages/devel/gettext-dummy/build similarity index 95% rename from packages/devel/gettext/build rename to packages/devel/gettext-dummy/build index 86bc3911e7..14f47ecfa5 100755 --- a/packages/devel/gettext/build +++ b/packages/devel/gettext-dummy/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1*/ +cd $PKG_BUILD/ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/devel/gettext/install b/packages/devel/gettext-dummy/install similarity index 50% rename from packages/devel/gettext/install rename to packages/devel/gettext-dummy/install index 0ee9276db9..68098af5c9 100755 --- a/packages/devel/gettext/install +++ b/packages/devel/gettext-dummy/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/libintl*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/.libs/libintl*.so* $INSTALL/usr/lib diff --git a/packages/devel/gettext/url b/packages/devel/gettext-dummy/url similarity index 100% rename from packages/devel/gettext/url rename to packages/devel/gettext-dummy/url diff --git a/packages/devel/glib/build b/packages/devel/glib/build index 66e9b8b08d..672c93fd6c 100755 --- a/packages/devel/glib/build +++ b/packages/devel/glib/build @@ -11,7 +11,7 @@ export ac_cv_func_posix_getgrgid_r=yes export glib_cv_stack_grows=no export glib_cv_uscore=no -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p .build-target diff --git a/packages/devel/glib/install b/packages/devel/glib/install index d97d91ecb7..125ca82beb 100755 --- a/packages/devel/glib/install +++ b/packages/devel/glib/install @@ -5,5 +5,5 @@ $SCRIPTS/install libiconv mkdir -p $INSTALL/usr/lib -cp -PR `find $BUILD/$1*/.build-target/g{lib,module,object,thread,io} -name *.so*` $INSTALL/usr/lib +cp -PR `find $PKG_BUILD/.build-target/g{lib,module,object,thread,io} -name *.so*` $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libg{lib,module,object,thread,io}*.so*T \ No newline at end of file diff --git a/packages/devel/libffi/build b/packages/devel/libffi/build index ff90a3b093..16ca98656d 100755 --- a/packages/devel/libffi/build +++ b/packages/devel/libffi/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/devel/libffi/install b/packages/devel/libffi/install index 65771cbb52..5ea9b92f47 100755 --- a/packages/devel/libffi/install +++ b/packages/devel/libffi/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/devel/liboil/build b/packages/devel/liboil/build index a76294e61a..d6991ae925 100755 --- a/packages/devel/liboil/build +++ b/packages/devel/liboil/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/devel/libpthread-stubs/build b/packages/devel/libpthread-stubs/build index 12a6848a1a..72683176a4 100755 --- a/packages/devel/libpthread-stubs/build +++ b/packages/devel/libpthread-stubs/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/devel/ncurses/build b/packages/devel/ncurses/build index 9897377507..be41a3ab29 100755 --- a/packages/devel/ncurses/build +++ b/packages/devel/ncurses/build @@ -6,7 +6,7 @@ CWD=`pwd` setup_toolchain host -cd $BUILD/$1*/ncurses-host +cd $PKG_BUILD/ncurses-host ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -22,7 +22,7 @@ setup_toolchain target $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/devel/ncurses/install b/packages/devel/ncurses/install index a18f894da1..bc1fa8244e 100755 --- a/packages/devel/ncurses/install +++ b/packages/devel/ncurses/install @@ -3,7 +3,7 @@ . config/options mkdir -p $INSTALL/usr/lib -cp $BUILD/$1*/lib/libncurses.so* $INSTALL/usr/lib +cp $PKG_BUILD/lib/libncurses.so* $INSTALL/usr/lib #mkdir -p $INSTALL/usr/share/terminfo/l -#TERMINFO=$INSTALL/usr/share/terminfo LD_LIBRARY_PATH=`ls -d $BUILD/$1*/ncurses-host/lib`:$LD_LIBRARY_PATH $BUILD/$1*/ncurses-host/progs/tic -xe linux $BUILD/$1*/misc/terminfo.src +#TERMINFO=$INSTALL/usr/share/terminfo LD_LIBRARY_PATH=`ls -d $PKG_BUILD/ncurses-host/lib`:$LD_LIBRARY_PATH $PKG_BUILD/ncurses-host/progs/tic -xe linux $PKG_BUILD/misc/terminfo.src diff --git a/packages/devel/ncurses/unpack b/packages/devel/ncurses/unpack index 639f0bdc89..1044ce1e41 100755 --- a/packages/devel/ncurses/unpack +++ b/packages/devel/ncurses/unpack @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -NCURSES_DIR=`ls -d $BUILD/$1*` +NCURSES_DIR=`ls -d $PKG_BUILD` cp -r "$NCURSES_DIR" "$BUILD/ncurses-host" || rm -rf "$BUILD/ncurses-host" mv "$BUILD/ncurses-host" "$NCURSES_DIR" diff --git a/packages/devel/readline/build b/packages/devel/readline/build index 72e14a0d77..03a3db0e2f 100755 --- a/packages/devel/readline/build +++ b/packages/devel/readline/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build ncurses -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/devel/readline/unpack b/packages/devel/readline/unpack index 331b1ea04d..73dc5c0ad3 100755 --- a/packages/devel/readline/unpack +++ b/packages/devel/readline/unpack @@ -2,4 +2,4 @@ . config/options -$SCRIPTS/fixconfigtools $BUILD/$1*/support +$SCRIPTS/fixconfigtools $PKG_BUILD/support diff --git a/packages/emulators/SDL/build b/packages/emulators/SDL/build index aafc675834..a991349558 100755 --- a/packages/emulators/SDL/build +++ b/packages/emulators/SDL/build @@ -8,7 +8,7 @@ $SCRIPTS/build libX11 $SCRIPTS/build libXrandr $SCRIPTS/build $MESA -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -102,4 +102,4 @@ $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \ $ROOT/$TOOLCHAIN/bin/sdl-config mkdir -p $ROOT/$TOOLCHAIN/include -ln -snf `echo $ROOT/$BUILD/$1*/include` $ROOT/$TOOLCHAIN/include/SDL +ln -snf `echo $ROOT/$PKG_BUILD/include` $ROOT/$TOOLCHAIN/include/SDL diff --git a/packages/emulators/SDL/install b/packages/emulators/SDL/install index 307706d0ec..9d0fbf6606 100755 --- a/packages/emulators/SDL/install +++ b/packages/emulators/SDL/install @@ -8,4 +8,4 @@ $SCRIPTS/install libXrandr $SCRIPTS/install $MESA mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/build/.libs/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/build/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/emulators/SDL_image/build b/packages/emulators/SDL_image/build index a327c344c9..2140b970a1 100755 --- a/packages/emulators/SDL_image/build +++ b/packages/emulators/SDL_image/build @@ -9,7 +9,7 @@ $SCRIPTS/build libexif $SCRIPTS/build libungif $SCRIPTS/build libpng -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/emulators/SDL_image/install b/packages/emulators/SDL_image/install index cf9d21532c..0748c89a2f 100755 --- a/packages/emulators/SDL_image/install +++ b/packages/emulators/SDL_image/install @@ -9,5 +9,5 @@ $SCRIPTS/install libexif $SCRIPTS/install libpng mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/emulators/SDL_mixer/build b/packages/emulators/SDL_mixer/build index 9ce1fdcdfa..530349fa7a 100755 --- a/packages/emulators/SDL_mixer/build +++ b/packages/emulators/SDL_mixer/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build SDL -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/emulators/SDL_mixer/install b/packages/emulators/SDL_mixer/install index a3aaf79308..f4093e6a69 100755 --- a/packages/emulators/SDL_mixer/install +++ b/packages/emulators/SDL_mixer/install @@ -5,4 +5,4 @@ $SCRIPTS/install SDL mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/build/.libs/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/build/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/emulators/SDL_net/build b/packages/emulators/SDL_net/build index 5b4d470de3..07b75e6892 100755 --- a/packages/emulators/SDL_net/build +++ b/packages/emulators/SDL_net/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build SDL -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/emulators/SDL_net/install b/packages/emulators/SDL_net/install index 4eca9961ef..d18e2c5228 100755 --- a/packages/emulators/SDL_net/install +++ b/packages/emulators/SDL_net/install @@ -5,5 +5,5 @@ $SCRIPTS/install SDL mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/emulators/SDL_ttf/build b/packages/emulators/SDL_ttf/build index 5b4d470de3..07b75e6892 100755 --- a/packages/emulators/SDL_ttf/build +++ b/packages/emulators/SDL_ttf/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build SDL -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/emulators/SDL_ttf/install b/packages/emulators/SDL_ttf/install index 4eca9961ef..d18e2c5228 100755 --- a/packages/emulators/SDL_ttf/install +++ b/packages/emulators/SDL_ttf/install @@ -5,5 +5,5 @@ $SCRIPTS/install SDL mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/emulators/mednafen/build b/packages/emulators/mednafen/build index 55e4f8dc3d..f7adc67d12 100755 --- a/packages/emulators/mednafen/build +++ b/packages/emulators/mednafen/build @@ -10,7 +10,7 @@ $SCRIPTS/build libsndfile $SCRIPTS/build alsa-lib $SCRIPTS/build zlib -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/emulators/mednafen/install b/packages/emulators/mednafen/install index 29ff330452..9120530e8d 100755 --- a/packages/emulators/mednafen/install +++ b/packages/emulators/mednafen/install @@ -7,4 +7,4 @@ $SCRIPTS/install SDL_net $SCRIPTS/install alsa-lib mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/src/$1 $INSTALL/usr/bin +cp $PKG_BUILD/src/$1 $INSTALL/usr/bin diff --git a/packages/emulators/scummvm/build b/packages/emulators/scummvm/build index 339de2485c..7730acaf98 100755 --- a/packages/emulators/scummvm/build +++ b/packages/emulators/scummvm/build @@ -7,7 +7,7 @@ $SCRIPTS/build SDL $SCRIPTS/build alsa-lib $SCRIPTS/build zlib -cd $BUILD/$1* +cd $PKG_BUILD # export CXX=$TARGET_CXX ./configure --host=openelec-$TARGET_ARCH \ --prefix=/usr \ diff --git a/packages/emulators/scummvm/install b/packages/emulators/scummvm/install index 7689d05853..981fbde696 100755 --- a/packages/emulators/scummvm/install +++ b/packages/emulators/scummvm/install @@ -6,11 +6,11 @@ $SCRIPTS/install SDL $SCRIPTS/install alsa-lib mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/scummvm $INSTALL/usr/bin +cp $PKG_BUILD/scummvm $INSTALL/usr/bin #mkdir -p $INSTALL/usr/share/applications #cp $PACKAGES/$1*/config/$1.desktop $INSTALL/usr/share/applications mkdir -p $INSTALL/usr/share/scummvm -cp $BUILD/$1*/dists/engine-data/* $INSTALL/usr/share/scummvm -cp $BUILD/$1*/icons/scummvm.xpm $INSTALL/usr/share/scummvm +cp $PKG_BUILD/dists/engine-data/* $INSTALL/usr/share/scummvm +cp $PKG_BUILD/icons/scummvm.xpm $INSTALL/usr/share/scummvm diff --git a/packages/emulators/zsnes/build b/packages/emulators/zsnes/build index db9db3da37..8b1d762ed1 100755 --- a/packages/emulators/zsnes/build +++ b/packages/emulators/zsnes/build @@ -11,7 +11,7 @@ $SCRIPTS/build $MESA export HOST_CXX export HOST_CXXFLAGS -cd $BUILD/$1*/src +cd $PKG_BUILD/src ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/emulators/zsnes/install b/packages/emulators/zsnes/install index cbb2047bc3..4840f255b1 100755 --- a/packages/emulators/zsnes/install +++ b/packages/emulators/zsnes/install @@ -10,10 +10,10 @@ $SCRIPTS/install $MESA mkdir -p $INSTALL/etc/zsnes mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/src/zsnesd $INSTALL/usr/bin +cp $PKG_BUILD/src/zsnesd $INSTALL/usr/bin #mkdir -p $INSTALL/usr/share/applications #cp $PACKAGES/$1*/config/$1.desktop $INSTALL/usr/share/applications #mkdir -p $INSTALL/usr/share/zsnes -#cp $BUILD/$1*/src/icons/64x64x32.png $INSTALL/usr/share/zsnes/zsnes.png +#cp $PKG_BUILD/src/icons/64x64x32.png $INSTALL/usr/share/zsnes/zsnes.png diff --git a/packages/emulators/zsnes/unpack b/packages/emulators/zsnes/unpack index 7a4deb1f4d..671a93ebdf 100755 --- a/packages/emulators/zsnes/unpack +++ b/packages/emulators/zsnes/unpack @@ -2,4 +2,4 @@ . config/options -sed -i -e "s:return(string(string(\"gcc \")+cflags+(\" -o \")+obj+string(\" -c \")+c));:return(string(string(\"$TARGET_CC \")+cflags+(\" -o \")+obj+string(\" -c \")+c));:" $BUILD/$1*/src/parsegen.cpp +sed -i -e "s:return(string(string(\"gcc \")+cflags+(\" -o \")+obj+string(\" -c \")+c));:return(string(string(\"$TARGET_CC \")+cflags+(\" -o \")+obj+string(\" -c \")+c));:" $PKG_BUILD/src/parsegen.cpp diff --git a/packages/games/openal-soft/build b/packages/games/openal-soft/build index f46e6afe4d..25c5f894d3 100755 --- a/packages/games/openal-soft/build +++ b/packages/games/openal-soft/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p .build cd .build diff --git a/packages/games/openal-soft/install b/packages/games/openal-soft/install index 86113af4bd..a10497e8e2 100755 --- a/packages/games/openal-soft/install +++ b/packages/games/openal-soft/install @@ -3,5 +3,5 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/.build/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/.build/*.so* $INSTALL/usr/lib diff --git a/packages/games/physfs/build b/packages/games/physfs/build index f46e6afe4d..25c5f894d3 100755 --- a/packages/games/physfs/build +++ b/packages/games/physfs/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p .build cd .build diff --git a/packages/games/physfs/install b/packages/games/physfs/install index 86113af4bd..a10497e8e2 100755 --- a/packages/games/physfs/install +++ b/packages/games/physfs/install @@ -3,5 +3,5 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/.build/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/.build/*.so* $INSTALL/usr/lib diff --git a/packages/games/supertux/build b/packages/games/supertux/build index 2d9fe370b2..d2bfe8a682 100755 --- a/packages/games/supertux/build +++ b/packages/games/supertux/build @@ -9,7 +9,7 @@ $SCRIPTS/build SDL $SCRIPTS/build SDL_image $SCRIPTS/build SDL_mixer -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p .build diff --git a/packages/games/supertux/install b/packages/games/supertux/install index 649ce2dde0..a819fa7a8a 100755 --- a/packages/games/supertux/install +++ b/packages/games/supertux/install @@ -9,9 +9,9 @@ $SCRIPTS/install SDL_image $SCRIPTS/install SDL_mixer mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/supertux2 $INSTALL/usr/bin +cp $PKG_BUILD/supertux2 $INSTALL/usr/bin mkdir -p $INSTALL/usr/share/games/supertux2 -cp -a $BUILD/$1*/data/* $INSTALL/usr/share/games/supertux2 +cp -a $PKG_BUILD/data/* $INSTALL/usr/share/games/supertux2 rm $INSTALL/usr/share/games/supertux2/Jamfile -#cp $BUILD/$1*/supertux.png $INSTALL/usr/share/supertux +#cp $PKG_BUILD/supertux.png $INSTALL/usr/share/supertux diff --git a/packages/graphics/Mesa-openchrome/build b/packages/graphics/Mesa-openchrome/build index 46ab5a733e..685bfc4883 100755 --- a/packages/graphics/Mesa-openchrome/build +++ b/packages/graphics/Mesa-openchrome/build @@ -13,7 +13,7 @@ $SCRIPTS/build libXxf86vm $SCRIPTS/build libX11 $SCRIPTS/build libwsbm -cd $BUILD/$1* +cd $PKG_BUILD HOST_CC=$HOST_CC \ OPT_FLAGS="$CFLAGS -D_GNU_SOURCE" \ HOST_OPT_FLAGS="$HOST_CFLAGS" \ diff --git a/packages/graphics/Mesa-openchrome/install b/packages/graphics/Mesa-openchrome/install index bdda8fa240..d85b940ce7 100755 --- a/packages/graphics/Mesa-openchrome/install +++ b/packages/graphics/Mesa-openchrome/install @@ -12,13 +12,13 @@ $SCRIPTS/install libX11 $SCRIPTS/install libwsbm mkdir -p $INSTALL/usr/lib -#cp -PR $BUILD/$1*/src/mesa/libmesa.so* $INSTALL/usr/lib -#cp -PR $BUILD/$1*/src/mesa/libglapi.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/lib/libGL.so* $INSTALL/usr/lib -#cp -PR $BUILD/$1*/lib/libGLU.so* $INSTALL/usr/lib +#cp -PR $PKG_BUILD/src/mesa/libmesa.so* $INSTALL/usr/lib +#cp -PR $PKG_BUILD/src/mesa/libglapi.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/lib/libGL.so* $INSTALL/usr/lib +#cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dri -cp -PR $BUILD/$1*/lib/*_dri.so $INSTALL/usr/lib/dri +cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/progs/xdemos/{corender,glsync,glthreads,glxcontexts,glxdemo,glxgears,glxgears_fbconfig,glxgears_pixmap,glxheads,glxinfo,glxpbdemo,glxpixmap,glxsnoop,glxswapcontrol,manywin,offset,overlay,pbdemo,pbinfo,sharedtex,sharedtex_mt,texture_from_pixmap,wincopy,xfont,xrotfontdemo} $INSTALL/usr/bin +cp -PR $PKG_BUILD/progs/xdemos/{corender,glsync,glthreads,glxcontexts,glxdemo,glxgears,glxgears_fbconfig,glxgears_pixmap,glxheads,glxinfo,glxpbdemo,glxpixmap,glxsnoop,glxswapcontrol,manywin,offset,overlay,pbdemo,pbinfo,sharedtex,sharedtex_mt,texture_from_pixmap,wincopy,xfont,xrotfontdemo} $INSTALL/usr/bin diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index 41eac1c6ba..a1c31cfc5a 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -13,7 +13,7 @@ $SCRIPTS/build libXxf86vm $SCRIPTS/build libX11 #$SCRIPTS/build libwsbm -cd $BUILD/$1* +cd $PKG_BUILD HOST_CC=$HOST_CC \ OPT_FLAGS="$CFLAGS -D_GNU_SOURCE" \ HOST_OPT_FLAGS="$HOST_CFLAGS" \ diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 85a64330c2..bced42afcb 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -11,11 +11,11 @@ $SCRIPTS/install libXxf86vm $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -#cp -PR $BUILD/$1*/src/mesa/libmesa.so* $INSTALL/usr/lib -#cp -PR $BUILD/$1*/src/mesa/libglapi.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/lib/libGL.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/lib/libdricore.so $INSTALL/usr/lib -#cp -PR $BUILD/$1*/lib/libGLU.so* $INSTALL/usr/lib +#cp -PR $PKG_BUILD/src/mesa/libmesa.so* $INSTALL/usr/lib +#cp -PR $PKG_BUILD/src/mesa/libglapi.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/lib/libGL.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib +#cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dri -cp -PR $BUILD/$1*/lib/*_dri.so $INSTALL/usr/lib/dri +cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri diff --git a/packages/graphics/cairo/build b/packages/graphics/cairo/build index fe80379ccf..cd45428dc0 100755 --- a/packages/graphics/cairo/build +++ b/packages/graphics/cairo/build @@ -13,7 +13,7 @@ $SCRIPTS/build libX11 #$SCRIPTS/build libxcb #$SCRIPTS/build xcb-util -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/graphics/cairo/install b/packages/graphics/cairo/install index b551fbd2d0..34dc85c5d4 100755 --- a/packages/graphics/cairo/install +++ b/packages/graphics/cairo/install @@ -13,4 +13,4 @@ $SCRIPTS/install libX11 #$SCRIPTS/install xcb-util mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libcairo.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libcairo.so* $INSTALL/usr/lib diff --git a/packages/graphics/driconf/build b/packages/graphics/driconf/build index 549d66f12f..3e5de86508 100755 --- a/packages/graphics/driconf/build +++ b/packages/graphics/driconf/build @@ -8,7 +8,7 @@ $SCRIPTS/build pygtk . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD sed -i -e "s%/usr/local%/usr%" setup.cfg diff --git a/packages/graphics/driconf/install b/packages/graphics/driconf/install index 0911221b52..eb78610813 100755 --- a/packages/graphics/driconf/install +++ b/packages/graphics/driconf/install @@ -6,7 +6,7 @@ $SCRIPTS/install Python $SCRIPTS/install pygtk $SCRIPTS/install xdriinfo -BUILD_DIR=`ls -d $BUILD/$1*` +BUILD_DIR=`ls -d $PKG_BUILD` . config/options.python diff --git a/packages/graphics/jpeg/build b/packages/graphics/jpeg/build index 38c574317d..07fd477d2d 100755 --- a/packages/graphics/jpeg/build +++ b/packages/graphics/jpeg/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/graphics/jpeg/install b/packages/graphics/jpeg/install index 65771cbb52..5ea9b92f47 100755 --- a/packages/graphics/jpeg/install +++ b/packages/graphics/jpeg/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/graphics/libdrm-newttm/build b/packages/graphics/libdrm-newttm/build index 6e1eac683b..5c47456912 100755 --- a/packages/graphics/libdrm-newttm/build +++ b/packages/graphics/libdrm-newttm/build @@ -7,7 +7,7 @@ $SCRIPTS/build libpthread-stubs $SCRIPTS/build udev $SCRIPTS/build linux -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/graphics/libdrm-newttm/install b/packages/graphics/libdrm-newttm/install index 5f03388f59..ac10ee8c44 100755 --- a/packages/graphics/libdrm-newttm/install +++ b/packages/graphics/libdrm-newttm/install @@ -8,16 +8,16 @@ $SCRIPTS/install linux system VER=`ls $BUILD/linux*/modules/lib/modules` mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/libdrm/.libs/libdrm.so* $INSTALL/usr/lib -#cp -PR $BUILD/$1*/libdrm/intel/.libs/libdrm_intel.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libdrm/.libs/libdrm.so* $INSTALL/usr/lib +#cp -PR $PKG_BUILD/libdrm/intel/.libs/libdrm_intel.so* $INSTALL/usr/lib #mkdir -p $INSTALL/lib/modules/$VER mkdir -p "`ls -d $INSTALL/lib/modules/*`/kernel/drivers/gpu/drm" -cp -r $BUILD/$1*/linux-core/drm.ko $INSTALL/lib/modules/*/kernel/drivers/gpu/drm +cp -r $PKG_BUILD/linux-core/drm.ko $INSTALL/lib/modules/*/kernel/drivers/gpu/drm mkdir -p "`ls -d $INSTALL/lib/modules/*`/kernel/drivers/gpu/drm/openchrome" -cp -r $BUILD/$1*/linux-core/openchrome/*.ko $INSTALL/lib/modules/*/kernel/drivers/gpu/drm/openchrome +cp -r $PKG_BUILD/linux-core/openchrome/*.ko $INSTALL/lib/modules/*/kernel/drivers/gpu/drm/openchrome for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do $STRIP --strip-debug $MOD diff --git a/packages/graphics/libdrm/build b/packages/graphics/libdrm/build index cc7fc55232..fbbe9b2d78 100755 --- a/packages/graphics/libdrm/build +++ b/packages/graphics/libdrm/build @@ -9,7 +9,7 @@ $SCRIPTS/build udev export LIBUDEV_CFLAGS="-I`ls -d $ROOT/$BUILD/udev*`" export LIBUDEV_LIBS="-I`ls -d $ROOT/$BUILD/udev*`" -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/graphics/libdrm/install b/packages/graphics/libdrm/install index fb46a72a00..8e371c9377 100755 --- a/packages/graphics/libdrm/install +++ b/packages/graphics/libdrm/install @@ -3,13 +3,13 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/libdrm/.libs/libdrm.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libdrm/.libs/libdrm.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/libdrm/intel/.libs/libdrm_intel*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libdrm/intel/.libs/libdrm_intel*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libdrm_intel*.so*T -cp -PR $BUILD/$1*/libdrm/nouveau/.libs/libdrm_nouveau*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libdrm/nouveau/.libs/libdrm_nouveau*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libdrm_nouveau*.so*T -cp -PR $BUILD/$1*/libdrm/radeon/.libs/libdrm_radeon*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libdrm/radeon/.libs/libdrm_radeon*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libdrm_radeon*.so*T diff --git a/packages/graphics/libexif/build b/packages/graphics/libexif/build index 73bcd69eae..3f319eadd5 100755 --- a/packages/graphics/libexif/build +++ b/packages/graphics/libexif/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/graphics/libexif/install b/packages/graphics/libexif/install index 3b3a06308c..ece847634f 100755 --- a/packages/graphics/libexif/install +++ b/packages/graphics/libexif/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/libexif/.libs/libexif.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/libexif/.libs/libexif.so* $INSTALL/usr/lib diff --git a/packages/graphics/libpng/build b/packages/graphics/libpng/build index c39c57e8d7..72495965cb 100755 --- a/packages/graphics/libpng/build +++ b/packages/graphics/libpng/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build zlib -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_lib_z_zlibVersion=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/graphics/libpng/install b/packages/graphics/libpng/install index ca7f1779cf..3623195ff4 100755 --- a/packages/graphics/libpng/install +++ b/packages/graphics/libpng/install @@ -3,5 +3,5 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/libpng12.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/.libs/libpng12.so* $INSTALL/usr/lib ln -sf libpng12.so.0 $INSTALL/usr/lib/libpng.so.3 diff --git a/packages/graphics/libungif/build b/packages/graphics/libungif/build index 44294c6c06..11cf12ad1d 100755 --- a/packages/graphics/libungif/build +++ b/packages/graphics/libungif/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/graphics/tiff/build b/packages/graphics/tiff/build index cc37a0a3df..6d9a8903e0 100755 --- a/packages/graphics/tiff/build +++ b/packages/graphics/tiff/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build jpeg $SCRIPTS/build zlib -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/graphics/tiff/install b/packages/graphics/tiff/install index 098ddcbbb2..236aa31ec6 100755 --- a/packages/graphics/tiff/install +++ b/packages/graphics/tiff/install @@ -6,4 +6,4 @@ $SCRIPTS/install jpeg $SCRIPTS/install zlib mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/libtiff/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libtiff/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 11977cd1cb..5eda227fce 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -9,10 +9,10 @@ $SCRIPTS/build zlib $SCRIPTS/build libffi PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" -PY_BUILD_DIR=`ls -d $ROOT/$BUILD/$1*` +PY_BUILD_DIR=`ls -d $ROOT/$PKG_BUILD` PY_BASE_VERSION=2.6 -cd $BUILD/$1* +cd $PKG_BUILD setup_toolchain host diff --git a/packages/lang/Python/install b/packages/lang/Python/install index 094c9374f9..2cdc543a15 100755 --- a/packages/lang/Python/install +++ b/packages/lang/Python/install @@ -6,46 +6,46 @@ PYTHON_VERSION=2.6 PYTHON_LIB_DIR=$INSTALL/usr/lib/python$PYTHON_VERSION mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/python $INSTALL/usr/bin/ +cp $PKG_BUILD/python $INSTALL/usr/bin/ $STRIP $INSTALL/usr/bin/python #mkdir -p $INSTALL/usr/lib -#cp $BUILD/$1*/libpython*.so* $INSTALL/usr/lib/ +#cp $PKG_BUILD/libpython*.so* $INSTALL/usr/lib/ mkdir -p $PYTHON_LIB_DIR/lib-dynload -cp $BUILD/$1*/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload +cp $PKG_BUILD/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload -cp $BUILD/$1*/Lib/*.pyc $PYTHON_LIB_DIR -cp $BUILD/$1*/Lib/site.py $PYTHON_LIB_DIR -cp $BUILD/$1*/Lib/doctest.py $PYTHON_LIB_DIR -cp $BUILD/$1*/Lib/unittest.py $PYTHON_LIB_DIR +cp $PKG_BUILD/Lib/*.pyc $PYTHON_LIB_DIR +cp $PKG_BUILD/Lib/site.py $PYTHON_LIB_DIR +cp $PKG_BUILD/Lib/doctest.py $PYTHON_LIB_DIR +cp $PKG_BUILD/Lib/unittest.py $PYTHON_LIB_DIR mkdir -p $PYTHON_LIB_DIR/plat-linux2 -cp $BUILD/$1*/Lib/plat-linux2/* $PYTHON_LIB_DIR/plat-linux2 +cp $PKG_BUILD/Lib/plat-linux2/* $PYTHON_LIB_DIR/plat-linux2 mkdir -p $PYTHON_LIB_DIR/json -cp $BUILD/$1*/Lib/json/*.pyc $PYTHON_LIB_DIR/json +cp $PKG_BUILD/Lib/json/*.pyc $PYTHON_LIB_DIR/json mkdir -p $PYTHON_LIB_DIR/xml -cp $BUILD/$1*/Lib/xml/*.pyc $PYTHON_LIB_DIR/xml +cp $PKG_BUILD/Lib/xml/*.pyc $PYTHON_LIB_DIR/xml mkdir -p $PYTHON_LIB_DIR/xml/dom -cp $BUILD/$1*/Lib/xml/dom/*.pyc $PYTHON_LIB_DIR/xml/dom +cp $PKG_BUILD/Lib/xml/dom/*.pyc $PYTHON_LIB_DIR/xml/dom mkdir -p $PYTHON_LIB_DIR/xml/parsers -cp $BUILD/$1*/Lib/xml/parsers/*.pyc $PYTHON_LIB_DIR/xml/parsers +cp $PKG_BUILD/Lib/xml/parsers/*.pyc $PYTHON_LIB_DIR/xml/parsers mkdir -p $PYTHON_LIB_DIR/xml/sax -cp $BUILD/$1*/Lib/xml/sax/*.pyc $PYTHON_LIB_DIR/xml/sax +cp $PKG_BUILD/Lib/xml/sax/*.pyc $PYTHON_LIB_DIR/xml/sax mkdir -p $PYTHON_LIB_DIR/encodings -cp $BUILD/$1*/Lib/encodings/*.pyc $PYTHON_LIB_DIR/encodings +cp $PKG_BUILD/Lib/encodings/*.pyc $PYTHON_LIB_DIR/encodings mkdir -p $PYTHON_LIB_DIR/logging -cp $BUILD/$1*/Lib/logging/*.pyc $PYTHON_LIB_DIR/logging +cp $PKG_BUILD/Lib/logging/*.pyc $PYTHON_LIB_DIR/logging mkdir -p $PYTHON_LIB_DIR/distutils -cp $BUILD/$1*/Lib/distutils/*.pyc $PYTHON_LIB_DIR/distutils +cp $PKG_BUILD/Lib/distutils/*.pyc $PYTHON_LIB_DIR/distutils mkdir -p $PYTHON_LIB_DIR/distutils/command -cp $BUILD/$1*/Lib/distutils/command/*.pyc $PYTHON_LIB_DIR/distutils/command +cp $PKG_BUILD/Lib/distutils/command/*.pyc $PYTHON_LIB_DIR/distutils/command # For future 3rd-parties Python modules mkdir -p $PYTHON_LIB_DIR/site-packages @@ -54,44 +54,44 @@ mkdir -p $PYTHON_LIB_DIR/site-packages ### for test ### #mkdir -p $PYTHON_LIB_DIR/bsddb -#cp $BUILD/$1*/Lib/bsddb/*.pyc $PYTHON_LIB_DIR/bsddb +#cp $PKG_BUILD/Lib/bsddb/*.pyc $PYTHON_LIB_DIR/bsddb mkdir -p $PYTHON_LIB_DIR/compiler -cp $BUILD/$1*/Lib/compiler/*.pyc $PYTHON_LIB_DIR/compiler +cp $PKG_BUILD/Lib/compiler/*.pyc $PYTHON_LIB_DIR/compiler mkdir -p $PYTHON_LIB_DIR/ctypes -cp $BUILD/$1*/Lib/ctypes/*.pyc $PYTHON_LIB_DIR/ctypes +cp $PKG_BUILD/Lib/ctypes/*.pyc $PYTHON_LIB_DIR/ctypes mkdir -p $PYTHON_LIB_DIR/ctypes/macholib -cp $BUILD/$1*/Lib/ctypes/macholib/*.pyc $PYTHON_LIB_DIR/ctypes/macholib +cp $PKG_BUILD/Lib/ctypes/macholib/*.pyc $PYTHON_LIB_DIR/ctypes/macholib #mkdir -p $PYTHON_LIB_DIR/curses -#cp $BUILD/$1*/Lib/curses/*.pyc $PYTHON_LIB_DIR/curses +#cp $PKG_BUILD/Lib/curses/*.pyc $PYTHON_LIB_DIR/curses #mkdir -p $PYTHON_LIB_DIR/email -#cp $BUILD/$1*/Lib/email/*.pyc $PYTHON_LIB_DIR/email +#cp $PKG_BUILD/Lib/email/*.pyc $PYTHON_LIB_DIR/email #mkdir -p $PYTHON_LIB_DIR/email/mime -#cp $BUILD/$1*/Lib/email/mime/*.pyc $PYTHON_LIB_DIR/email/mime +#cp $PKG_BUILD/Lib/email/mime/*.pyc $PYTHON_LIB_DIR/email/mime mkdir -p $PYTHON_LIB_DIR/hotshot -cp $BUILD/$1*/Lib/hotshot/*.pyc $PYTHON_LIB_DIR/hotshot +cp $PKG_BUILD/Lib/hotshot/*.pyc $PYTHON_LIB_DIR/hotshot mkdir -p $PYTHON_LIB_DIR/idlelib -cp $BUILD/$1*/Lib/idlelib/*.pyc $PYTHON_LIB_DIR/idlelib +cp $PKG_BUILD/Lib/idlelib/*.pyc $PYTHON_LIB_DIR/idlelib #mkdir -p $PYTHON_LIB_DIR/lib-tk -#cp $BUILD/$1*/Lib/lib-tk/*.pyc $PYTHON_LIB_DIR/lib-tk +#cp $PKG_BUILD/Lib/lib-tk/*.pyc $PYTHON_LIB_DIR/lib-tk #mkdir -p $PYTHON_LIB_DIR/msilib -#cp $BUILD/$1*/Lib/msilib/*.pyc $PYTHON_LIB_DIR/msilib +#cp $PKG_BUILD/Lib/msilib/*.pyc $PYTHON_LIB_DIR/msilib # not needed, we have pysqlite2 mkdir -p $PYTHON_LIB_DIR/sqlite3 -cp $BUILD/$1*/Lib/sqlite3/*.pyc $PYTHON_LIB_DIR/sqlite3 +cp $PKG_BUILD/Lib/sqlite3/*.pyc $PYTHON_LIB_DIR/sqlite3 #mkdir -p $PYTHON_LIB_DIR/wsgiref -#cp $BUILD/$1*/Lib/wsgiref/*.pyc $PYTHON_LIB_DIR/wsgiref +#cp $PKG_BUILD/Lib/wsgiref/*.pyc $PYTHON_LIB_DIR/wsgiref mkdir -p $PYTHON_LIB_DIR/xml/etree -cp $BUILD/$1*/Lib/xml/etree/*.pyc $PYTHON_LIB_DIR/xml/etree \ No newline at end of file +cp $PKG_BUILD/Lib/xml/etree/*.pyc $PYTHON_LIB_DIR/xml/etree \ No newline at end of file diff --git a/packages/linux/install b/packages/linux/install index f90198834a..69f1dae297 100755 --- a/packages/linux/install +++ b/packages/linux/install @@ -5,10 +5,10 @@ RAMFS_DRV_SUBSYSTEMS="ata ide scsi" PKG_DIR=`find $PACKAGES -type d -name $1` -VER=`ls $BUILD/$1*/modules/lib/modules` +VER=`ls $PKG_BUILD/modules/lib/modules` mkdir -p $INSTALL/lib/modules/$VER - cp -r $BUILD/$1*/modules/* $INSTALL + cp -r $PKG_BUILD/modules/* $INSTALL rm -f $INSTALL/lib/modules/$VER/modules.* for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do @@ -24,7 +24,7 @@ VER=`ls $BUILD/$1*/modules/lib/modules` # copy kernel firmwares (if present) rm -rf $INSTALL/lib/firmware mkdir -p $INSTALL/lib/firmware - cp -rf $BUILD/$1*/modules/lib/firmware/* $INSTALL/lib/firmware || echo "no firmware" + cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || echo "no firmware" mkdir -p $INSTALL/sbin cp $PKG_DIR/scripts/setup_tvcard_options $INSTALL/sbin diff --git a/packages/linux/unpack b/packages/linux/unpack index 1572d4efbb..1479b72840 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -6,7 +6,7 @@ $SCRIPTS/install make $SCRIPTS/install sed $SCRIPTS/unpack lzma -LINUX=`ls -d $BUILD/$1*` +LINUX=`ls -d $PKG_BUILD` PKG_DIR=`find $PACKAGES -type d -name $1` make -C $LINUX ARCH=$TARGET_ARCH INSTALL_HDR_PATH=dest headers_install diff --git a/packages/multimedia/gst-ffmpeg/build b/packages/multimedia/gst-ffmpeg/build index e751882601..67ee123d4b 100755 --- a/packages/multimedia/gst-ffmpeg/build +++ b/packages/multimedia/gst-ffmpeg/build @@ -16,7 +16,7 @@ $SCRIPTS/build gstreamer #$SCRIPTS/build libvorbis #$SCRIPTS/build cdparanoia -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/gst-ffmpeg/install b/packages/multimedia/gst-ffmpeg/install index b7fb2c198a..0d55df3078 100755 --- a/packages/multimedia/gst-ffmpeg/install +++ b/packages/multimedia/gst-ffmpeg/install @@ -12,6 +12,6 @@ PLUGINS_EXT="ffmpeg libpostproc libswscale" mkdir -p $INSTALL/usr/lib/gstreamer-0.10 for p in $PLUGINS_EXT; do - cp -PR $BUILD/$1*/ext/$p/.libs/*.so \ + cp -PR $PKG_BUILD/ext/$p/.libs/*.so \ $INSTALL/usr/lib/gstreamer-0.10 done diff --git a/packages/multimedia/gst-plugins-bad/build b/packages/multimedia/gst-plugins-bad/build index 3e9e30f250..9cf4d78d0c 100755 --- a/packages/multimedia/gst-plugins-bad/build +++ b/packages/multimedia/gst-plugins-bad/build @@ -20,7 +20,7 @@ $SCRIPTS/build bzip2 $SCRIPTS/build xvidcore -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_lib_xvidcore_xvid_encore=yes \ ac_cv_lib_xvidcore_xvid_decore=yes \ ac_cv_lib_xvidcore_xvid_global=yes \ diff --git a/packages/multimedia/gst-plugins-bad/install b/packages/multimedia/gst-plugins-bad/install index 2de82f41e7..2c33bf7285 100755 --- a/packages/multimedia/gst-plugins-bad/install +++ b/packages/multimedia/gst-plugins-bad/install @@ -13,8 +13,8 @@ $SCRIPTS/install alsa-lib #$SCRIPTS/install xvidcore mkdir -p $INSTALL/usr/lib/gstreamer-0.10 -cp -PR `find $BUILD/$1*/{ext,gst,sys} -name *.so` $INSTALL/usr/lib/gstreamer-0.10 +cp -PR `find $PKG_BUILD/{ext,gst,sys} -name *.so` $INSTALL/usr/lib/gstreamer-0.10 mkdir -p $INSTALL/usr/lib -cp -PR `find $BUILD/$1*/gst-libs -name *.so*` $INSTALL/usr/lib +cp -PR `find $PKG_BUILD/gst-libs -name *.so*` $INSTALL/usr/lib diff --git a/packages/multimedia/gst-plugins-base/build b/packages/multimedia/gst-plugins-base/build index 57d6f0146c..2c28067dfd 100755 --- a/packages/multimedia/gst-plugins-base/build +++ b/packages/multimedia/gst-plugins-base/build @@ -12,7 +12,7 @@ $SCRIPTS/build libvorbis $SCRIPTS/build cdparanoia #$SCRIPTS/build pango -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/gst-plugins-base/install b/packages/multimedia/gst-plugins-base/install index a2527799b5..85d317187b 100755 --- a/packages/multimedia/gst-plugins-base/install +++ b/packages/multimedia/gst-plugins-base/install @@ -8,8 +8,8 @@ $SCRIPTS/install libogg $SCRIPTS/install libvorbis mkdir -p $INSTALL/usr/lib -cp -PR `find $BUILD/$1*/gst-libs -name *.so*` $INSTALL/usr/lib +cp -PR `find $PKG_BUILD/gst-libs -name *.so*` $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libgst*.so*T mkdir -p $INSTALL/usr/lib/gstreamer-0.10 -cp -PR `find $BUILD/$1*/{ext,gst,sys} -name *.so` $INSTALL/usr/lib/gstreamer-0.10 +cp -PR `find $PKG_BUILD/{ext,gst,sys} -name *.so` $INSTALL/usr/lib/gstreamer-0.10 diff --git a/packages/multimedia/gst-plugins-good/build b/packages/multimedia/gst-plugins-good/build index bcc1303236..0285829cce 100755 --- a/packages/multimedia/gst-plugins-good/build +++ b/packages/multimedia/gst-plugins-good/build @@ -27,7 +27,7 @@ $SCRIPTS/build libpng -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/gst-plugins-good/install b/packages/multimedia/gst-plugins-good/install index 3e59ffe5fc..c4b6b26980 100755 --- a/packages/multimedia/gst-plugins-good/install +++ b/packages/multimedia/gst-plugins-good/install @@ -13,4 +13,4 @@ $SCRIPTS/install libpng $SCRIPTS/install libsoup mkdir -p $INSTALL/usr/lib/gstreamer-0.10 -cp -PR `find $BUILD/$1*/{ext,gst,sys} -name *.so` $INSTALL/usr/lib/gstreamer-0.10 +cp -PR `find $PKG_BUILD/{ext,gst,sys} -name *.so` $INSTALL/usr/lib/gstreamer-0.10 diff --git a/packages/multimedia/gst-plugins-ugly/build b/packages/multimedia/gst-plugins-ugly/build index abdae431d5..0d806dd032 100755 --- a/packages/multimedia/gst-plugins-ugly/build +++ b/packages/multimedia/gst-plugins-ugly/build @@ -17,7 +17,7 @@ $SCRIPTS/build twolame #$SCRIPTS/build libsidplay -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/gst-plugins-ugly/install b/packages/multimedia/gst-plugins-ugly/install index 87d6a2960e..dc8027d881 100755 --- a/packages/multimedia/gst-plugins-ugly/install +++ b/packages/multimedia/gst-plugins-ugly/install @@ -6,4 +6,4 @@ $SCRIPTS/install gstreamer #$SCRIPTS/install libsidplay mkdir -p $INSTALL/usr/lib/gstreamer-0.10 -cp -PR `find $BUILD/$1*/{ext,gst} -name *.so` $INSTALL/usr/lib/gstreamer-0.10 +cp -PR `find $PKG_BUILD/{ext,gst} -name *.so` $INSTALL/usr/lib/gstreamer-0.10 diff --git a/packages/multimedia/gst-rtsp/build b/packages/multimedia/gst-rtsp/build index 282de85f27..9ca75993b5 100755 --- a/packages/multimedia/gst-rtsp/build +++ b/packages/multimedia/gst-rtsp/build @@ -7,7 +7,7 @@ $SCRIPTS/build gstreamer $SCRIPTS/build glib $SCRIPTS/build Python -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/gst-rtsp/install b/packages/multimedia/gst-rtsp/install index 4d17e6f433..3016e3b6a5 100755 --- a/packages/multimedia/gst-rtsp/install +++ b/packages/multimedia/gst-rtsp/install @@ -9,10 +9,10 @@ $SCRIPTS/install Python PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/gst/rtsp-server/.libs/*.so* $INSTALL/usr/lib/ +cp -PR $PKG_BUILD/gst/rtsp-server/.libs/*.so* $INSTALL/usr/lib/ mkdir -p $PYTHON_LIB_DIR/site-packages/gst-0.10/gst -cp -PR $BUILD/$1*/bindings/python/.libs/*.so $PYTHON_LIB_DIR/site-packages/gst-0.10/gst +cp -PR $PKG_BUILD/bindings/python/.libs/*.so $PYTHON_LIB_DIR/site-packages/gst-0.10/gst mkdir -p $INSTALL/usr/share/gst-rtsp/0.10/defs -cp -PR $BUILD/$1*/bindings/python/*.defs $INSTALL/usr/share/gst-rtsp/0.10/defs +cp -PR $PKG_BUILD/bindings/python/*.defs $INSTALL/usr/share/gst-rtsp/0.10/defs diff --git a/packages/multimedia/gstreamer/build b/packages/multimedia/gstreamer/build index 5641eb57d4..85969fc21f 100755 --- a/packages/multimedia/gstreamer/build +++ b/packages/multimedia/gstreamer/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build glib $SCRIPTS/build libxml2 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/gstreamer/install b/packages/multimedia/gstreamer/install index 7e54588d0a..492a7764d1 100755 --- a/packages/multimedia/gstreamer/install +++ b/packages/multimedia/gstreamer/install @@ -6,14 +6,14 @@ $SCRIPTS/install glib $SCRIPTS/install libxml2 mkdir -p $INSTALL/usr/lib -cp -PR `find $BUILD/$1*/{gst,libs} -name *.so*` $INSTALL/usr/lib +cp -PR `find $PKG_BUILD/{gst,libs} -name *.so*` $INSTALL/usr/lib rm -rf `find $INSTALL/usr/lib -name libgst*.so*T` mkdir -p $INSTALL/usr/lib/gstreamer-0.10 -cp -PR `find $BUILD/$1*/plugins -name *.so` $INSTALL/usr/lib/gstreamer-0.10 +cp -PR `find $PKG_BUILD/plugins -name *.so` $INSTALL/usr/lib/gstreamer-0.10 if [ "$DEVTOOLS" = yes ]; then mkdir -p $INSTALL/usr/bin - cp -PR $BUILD/$1*/tools/gst-launch $INSTALL/usr/bin - cp -PR $BUILD/$1*/tools/.libs/* $INSTALL/usr/bin + cp -PR $PKG_BUILD/tools/gst-launch $INSTALL/usr/bin + cp -PR $PKG_BUILD/tools/.libs/* $INSTALL/usr/bin fi diff --git a/packages/multimedia/libdv/build b/packages/multimedia/libdv/build index 5d0a21bb3f..ebcfaf57fe 100755 --- a/packages/multimedia/libdv/build +++ b/packages/multimedia/libdv/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/libdvdcss/build b/packages/multimedia/libdvdcss/build index 18633ef70b..85fbf05d19 100755 --- a/packages/multimedia/libdvdcss/build +++ b/packages/multimedia/libdvdcss/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/libdvdcss/install b/packages/multimedia/libdvdcss/install index e179a80758..585701f591 100755 --- a/packages/multimedia/libdvdcss/install +++ b/packages/multimedia/libdvdcss/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libdvdcss.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libdvdcss.so* $INSTALL/usr/lib diff --git a/packages/multimedia/libdvdnav/build b/packages/multimedia/libdvdnav/build index 626b03876c..ef1d4fe878 100755 --- a/packages/multimedia/libdvdnav/build +++ b/packages/multimedia/libdvdnav/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libdvdread -cd $BUILD/$1* +cd $PKG_BUILD ./configure2 --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/libdvdnav/install b/packages/multimedia/libdvdnav/install index 989ae2de44..8ad30910f9 100755 --- a/packages/multimedia/libdvdnav/install +++ b/packages/multimedia/libdvdnav/install @@ -5,5 +5,5 @@ $SCRIPTS/install libdvdread mkdir -p $INSTALL/usr/lib -cp $BUILD/$1*/obj/libdvdnav.so $INSTALL/usr/lib/libdvdnav.so.4 +cp $PKG_BUILD/obj/libdvdnav.so $INSTALL/usr/lib/libdvdnav.so.4 ln -sf libdvdnav.so.4 $INSTALL/usr/lib/libdvdnavmini.so.4 diff --git a/packages/multimedia/libdvdread/build b/packages/multimedia/libdvdread/build index 91572e7f34..ae2800b174 100755 --- a/packages/multimedia/libdvdread/build +++ b/packages/multimedia/libdvdread/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libdvdcss -cd $BUILD/$1* +cd $PKG_BUILD ./configure2 --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/libdvdread/install b/packages/multimedia/libdvdread/install index e2f89ce3a4..a4c3582a22 100755 --- a/packages/multimedia/libdvdread/install +++ b/packages/multimedia/libdvdread/install @@ -5,4 +5,4 @@ $SCRIPTS/install libdvdcss mkdir -p $INSTALL/usr/lib -cp $BUILD/$1*/obj/libdvdread.so $INSTALL/usr/lib/libdvdread.so.4 +cp $PKG_BUILD/obj/libdvdread.so $INSTALL/usr/lib/libdvdread.so.4 diff --git a/packages/multimedia/libmpeg2/build b/packages/multimedia/libmpeg2/build index c315a4a688..2fc9d3615c 100755 --- a/packages/multimedia/libmpeg2/build +++ b/packages/multimedia/libmpeg2/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/libtheora/build b/packages/multimedia/libtheora/build index 0af82892ff..cfef6cb302 100755 --- a/packages/multimedia/libtheora/build +++ b/packages/multimedia/libtheora/build @@ -7,7 +7,7 @@ $SCRIPTS/build libogg $SCRIPTS/build libvorbis #$SCRIPTS/build SDL -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/pigment/build b/packages/multimedia/pigment/build index 1adc9658fa..26138d0a7e 100755 --- a/packages/multimedia/pigment/build +++ b/packages/multimedia/pigment/build @@ -13,7 +13,7 @@ $SCRIPTS/build libX11 $SCRIPTS/build glib $SCRIPTS/build gtk+ -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/pigment/install b/packages/multimedia/pigment/install index 057c2e55a8..48e69f6de7 100755 --- a/packages/multimedia/pigment/install +++ b/packages/multimedia/pigment/install @@ -19,13 +19,13 @@ $SCRIPTS/install gtk+ PLUGINS_DIR=`pkg-config pigment-0.3 --define-variable=prefix=/usr --variable=pluginsdir` mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/pgm/.libs/libpigment*.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/pgm/gtk/.libs/libpigment*.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/pgm/imaging/.libs/libpigment*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/pgm/.libs/libpigment*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/pgm/gtk/.libs/libpigment*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/pgm/imaging/.libs/libpigment*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libpigment*.so*T mkdir -p $INSTALL/$PLUGINS_DIR -cp -PR $BUILD/$1*/plugins/*/.libs/libpgm*.so $INSTALL/$PLUGINS_DIR +cp -PR $PKG_BUILD/plugins/*/.libs/libpgm*.so $INSTALL/$PLUGINS_DIR diff --git a/packages/multimedia/swfdec/build b/packages/multimedia/swfdec/build index cfc933709b..56d0e8b331 100755 --- a/packages/multimedia/swfdec/build +++ b/packages/multimedia/swfdec/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/multimedia/x264/build b/packages/multimedia/x264/build index 6f077bf87f..8f43d82af0 100755 --- a/packages/multimedia/x264/build +++ b/packages/multimedia/x264/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --prefix=/usr \ --enable-mp4-output \ diff --git a/packages/multimedia/x264/install b/packages/multimedia/x264/install index f83bcf8a03..3b66bca030 100755 --- a/packages/multimedia/x264/install +++ b/packages/multimedia/x264/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/renderutil/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/renderutil/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/multimedia/xvidcore/build b/packages/multimedia/xvidcore/build index bbe6cde964..0ef6de90bf 100755 --- a/packages/multimedia/xvidcore/build +++ b/packages/multimedia/xvidcore/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1*/build/generic +cd $PKG_BUILD/build/generic ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/network/avahi/build b/packages/network/avahi/build index 5f439da00f..c1796a0197 100755 --- a/packages/network/avahi/build +++ b/packages/network/avahi/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build expat -$SCRIPTS/build gettext +$SCRIPTS/build gettext-dummy $SCRIPTS/build libdaemon $SCRIPTS/build dbus $SCRIPTS/build Python @@ -13,7 +13,7 @@ $SCRIPTS/build pygtk . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_func_bind_textdomain_codeset=no \ ac_func_bind_textdomain_codeset=no \ diff --git a/packages/network/avahi/install b/packages/network/avahi/install index b4ac32b236..7c8f9d77de 100755 --- a/packages/network/avahi/install +++ b/packages/network/avahi/install @@ -4,7 +4,7 @@ $SCRIPTS/install expat $SCRIPTS/install libdaemon -$SCRIPTS/install gettext +$SCRIPTS/install gettext-dummy $SCRIPTS/install dbus $SCRIPTS/install Python $SCRIPTS/install dbus-python @@ -14,43 +14,43 @@ PKG_DIR=`find $PACKAGES -type d -name $1` PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $INSTALL/usr/sbin -cp -PR $BUILD/$1*/avahi-autoipd/avahi-autoipd $INSTALL/usr/sbin -cp -PR $BUILD/$1*/avahi-daemon/.libs/avahi-daemon $INSTALL/usr/sbin -cp -PR $BUILD/$1*/avahi-dnsconfd/.libs/avahi-dnsconfd $INSTALL/usr/sbin +cp -PR $PKG_BUILD/avahi-autoipd/avahi-autoipd $INSTALL/usr/sbin +cp -PR $PKG_BUILD/avahi-daemon/.libs/avahi-daemon $INSTALL/usr/sbin +cp -PR $PKG_BUILD/avahi-dnsconfd/.libs/avahi-dnsconfd $INSTALL/usr/sbin mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/avahi-common/.libs/*.so* $INSTALL/usr/lib/ -cp -PR $BUILD/$1*/avahi-core/.libs/*.so* $INSTALL/usr/lib/ +cp -PR $PKG_BUILD/avahi-common/.libs/*.so* $INSTALL/usr/lib/ +cp -PR $PKG_BUILD/avahi-core/.libs/*.so* $INSTALL/usr/lib/ rm -rf $INSTALL/usr/lib/libavahi*.so*T mkdir -p $INSTALL/etc/avahi -cp -PR $BUILD/$1*/avahi-autoipd/avahi-autoipd.action $INSTALL/etc/avahi -cp -PR $BUILD/$1*/avahi-daemon/avahi-daemon.conf $INSTALL/etc/avahi +cp -PR $PKG_BUILD/avahi-autoipd/avahi-autoipd.action $INSTALL/etc/avahi +cp -PR $PKG_BUILD/avahi-daemon/avahi-daemon.conf $INSTALL/etc/avahi mkdir -p $INSTALL/etc/avahi/services -cp -PR $BUILD/$1*/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services -cp -PR $BUILD/$1*/avahi-daemon/ssh.service $INSTALL/etc/avahi/services +cp -PR $PKG_BUILD/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services +cp -PR $PKG_BUILD/avahi-daemon/ssh.service $INSTALL/etc/avahi/services mkdir -p $INSTALL/etc/dbus-1/system.d -cp -PR $BUILD/$1*/avahi-daemon/avahi-dbus.conf $INSTALL/etc/dbus-1/system.d +cp -PR $PKG_BUILD/avahi-daemon/avahi-dbus.conf $INSTALL/etc/dbus-1/system.d mkdir -p $PYTHON_LIB_DIR/site-packages/avahi -cp $BUILD/$1*/avahi-python/avahi/*.pyc $PYTHON_LIB_DIR/site-packages/avahi +cp $PKG_BUILD/avahi-python/avahi/*.pyc $PYTHON_LIB_DIR/site-packages/avahi mkdir -p $INSTALL/usr/share/avahi -cp -PR $BUILD/$1*/service-type-database/service-types $INSTALL/usr/share/avahi -cp -PR $BUILD/$1*/avahi-daemon/avahi-service.dtd $INSTALL/usr/share/avahi +cp -PR $PKG_BUILD/service-type-database/service-types $INSTALL/usr/share/avahi +cp -PR $PKG_BUILD/avahi-daemon/avahi-service.dtd $INSTALL/usr/share/avahi mkdir -p $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/ServiceTypeBrowser.introspect $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/HostNameResolver.introspect $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/EntryGroup.introspect $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/ServiceBrowser.introspect $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/Server.introspect $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/DomainBrowser.introspect $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/ServiceResolver.introspect $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/RecordBrowser.introspect $INSTALL/usr/share/avahi/introspection -cp -PR $BUILD/$1*/avahi-daemon/AddressResolver.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/ServiceTypeBrowser.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/HostNameResolver.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/EntryGroup.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/ServiceBrowser.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/Server.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/DomainBrowser.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/ServiceResolver.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/RecordBrowser.introspect $INSTALL/usr/share/avahi/introspection +cp -PR $PKG_BUILD/avahi-daemon/AddressResolver.introspect $INSTALL/usr/share/avahi/introspection mkdir -p $INSTALL/usr/share/udhcpc cp $PKG_DIR/scripts/udhcp-avahi.script $INSTALL/usr/share/udhcpc/default.script diff --git a/packages/network/bluez/build b/packages/network/bluez/build index d56cd88c95..384d14acd7 100755 --- a/packages/network/bluez/build +++ b/packages/network/bluez/build @@ -5,9 +5,9 @@ $SCRIPTS/build toolchain $SCRIPTS/build dbus $SCRIPTS/build glib -$SCRIPTS/build gettext +$SCRIPTS/build gettext-dummy -cd $BUILD/$1* +cd $PKG_BUILD if [ $DEBUG = yes ]; then DEBUG_CONFIG="--enable-debug" diff --git a/packages/network/bluez/install b/packages/network/bluez/install index c3c1e91bd1..060b027910 100755 --- a/packages/network/bluez/install +++ b/packages/network/bluez/install @@ -4,42 +4,42 @@ $SCRIPTS/install dbus $SCRIPTS/install glib -$SCRIPTS/install gettext +$SCRIPTS/install gettext-dummy $SCRIPTS/install setserial PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/src/.libs/bluetoothd $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hciattach $INSTALL/usr/bin +cp $PKG_BUILD/src/.libs/bluetoothd $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hciattach $INSTALL/usr/bin if [ $DEVTOOLS = yes ]; then - cp $BUILD/$1*/tools/.libs/avinfo $INSTALL/usr/bin - cp $BUILD/$1*/tools/.libs/bccmd $INSTALL/usr/bin - cp $BUILD/$1*/tools/.libs/ciptool $INSTALL/usr/bin - cp $BUILD/$1*/tools/.libs/hciconfig $INSTALL/usr/bin - cp $BUILD/$1*/tools/hcisecfilter $INSTALL/usr/bin - cp $BUILD/$1*/tools/.libs/hcitool $INSTALL/usr/bin - cp $BUILD/$1*/tools/.libs/l2ping $INSTALL/usr/bin - cp $BUILD/$1*/tools/.libs/ppporc $INSTALL/usr/bin - cp $BUILD/$1*/tools/.libs/sdptool $INSTALL/usr/bin - cp $BUILD/$1*/test/.libs/hciemu $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/avinfo $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/bccmd $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/ciptool $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/hciconfig $INSTALL/usr/bin + cp $PKG_BUILD/tools/hcisecfilter $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/hcitool $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/l2ping $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/ppporc $INSTALL/usr/bin + cp $PKG_BUILD/tools/.libs/sdptool $INSTALL/usr/bin + cp $PKG_BUILD/test/.libs/hciemu $INSTALL/usr/bin fi cp $PKG_DIR/scripts/* $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib -cp $BUILD/$1*/lib/.libs/libbluetooth.so* $INSTALL/usr/lib +cp $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/bluetooth/plugins -cp $BUILD/$1*/plugins/.libs/*.so $INSTALL/usr/lib/bluetooth/plugins +cp $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/bluetooth/plugins mkdir -p $INSTALL/etc/bluetooth -cp $BUILD/$1*/src/main.conf $INSTALL/etc/bluetooth +cp $PKG_BUILD/src/main.conf $INSTALL/etc/bluetooth mkdir -p $INSTALL/etc/dbus-1/system.d -cp $BUILD/$1*/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d +cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/etc/udev/rules.d -cp $BUILD/$1*/scripts/bluetooth.rules \ +cp $PKG_BUILD/scripts/bluetooth.rules \ $INSTALL/etc/udev/rules.d/35_bluetooth.rules diff --git a/packages/network/connman/build b/packages/network/connman/build index 22a3c36f15..86449c962a 100755 --- a/packages/network/connman/build +++ b/packages/network/connman/build @@ -8,9 +8,9 @@ $SCRIPTS/build dbus $SCRIPTS/build udev $SCRIPTS/build busybox $SCRIPTS/build bluez -$SCRIPTS/build gettext +$SCRIPTS/build gettext-dummy -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/network/connman/install b/packages/network/connman/install index 4c2c013ddc..7341730da8 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -7,27 +7,27 @@ $SCRIPTS/install dbus $SCRIPTS/install udev $SCRIPTS/install bluez $SCRIPTS/install wpa_supplicant -$SCRIPTS/install gettext +$SCRIPTS/install gettext-dummy PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/sbin -cp -PR $BUILD/$1*/src/connmand $INSTALL/usr/sbin +cp -PR $PKG_BUILD/src/connmand $INSTALL/usr/sbin mkdir -p $INSTALL/usr/lib/connman/plugins -cp -PR $BUILD/$1*/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins +cp -PR $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins mkdir -p $INSTALL/usr/lib/connman/scripts -cp -PR $BUILD/$1*/scripts/udhcpc-script $INSTALL/usr/lib/connman/scripts +cp -PR $PKG_BUILD/scripts/udhcpc-script $INSTALL/usr/lib/connman/scripts mkdir -p $INSTALL/etc/dbus-1/system.d -cp -PR $BUILD/$1*/src/connman.conf $INSTALL/etc/dbus-1/system.d +cp -PR $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/etc/udev/rules.d -cp -PR $BUILD/$1*/src/92-connman.rules $INSTALL/etc/udev/rules.d +cp -PR $PKG_BUILD/src/92-connman.rules $INSTALL/etc/udev/rules.d #cp -PR $PKG_DIR/config/*.conf $INSTALL/etc #mkdir -p $INSTALL/usr/bin -#cp -PR $BUILD/$1*/client/cm $INSTALL/usr/bin +#cp -PR $PKG_BUILD/client/cm $INSTALL/usr/bin diff --git a/packages/network/libproxy/build b/packages/network/libproxy/build index 1bc28445a2..9c82417622 100755 --- a/packages/network/libproxy/build +++ b/packages/network/libproxy/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_func_malloc_0_nonnull=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/network/libproxy/install b/packages/network/libproxy/install index d256d0dfb4..911d393424 100755 --- a/packages/network/libproxy/install +++ b/packages/network/libproxy/install @@ -5,10 +5,10 @@ PLUGIN_DIR=`pkg-config libproxy-1.0 --define-variable=prefix=/usr --variable=plugindir` mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/src/bin/.libs/proxy $INSTALL/usr/bin +cp -PR $PKG_BUILD/src/bin/.libs/proxy $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/lib/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib mkdir -p $INSTALL/$PLUGIN_DIR -cp -PR $BUILD/$1*/src/plugins/.libs/*.so $INSTALL/$PLUGIN_DIR +cp -PR $PKG_BUILD/src/plugins/.libs/*.so $INSTALL/$PLUGIN_DIR diff --git a/packages/network/libsoup.old/build b/packages/network/libsoup.old/build index 94cb0b385a..fd6797e052 100755 --- a/packages/network/libsoup.old/build +++ b/packages/network/libsoup.old/build @@ -8,7 +8,7 @@ $SCRIPTS/build libxml2 #$SCRIPTS/build libproxy #$SCRIPTS/build gnutls -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_path_GLIB_GENMARSHAL=$ROOT/$TOOLCHAIN/bin/glib-genmarshal \ soup_cv_ipv6="no" \ diff --git a/packages/network/libsoup.old/install b/packages/network/libsoup.old/install index bf7f39e8aa..371ebc52d8 100755 --- a/packages/network/libsoup.old/install +++ b/packages/network/libsoup.old/install @@ -7,8 +7,8 @@ $SCRIPTS/install glib $SCRIPTS/install libxml2 mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/$1/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/$1/.libs/*.so* $INSTALL/usr/lib mkdir -p $INSTALL/tests -cp -PR $BUILD/$1*/tests/.libs/* $INSTALL/tests +cp -PR $PKG_BUILD/tests/.libs/* $INSTALL/tests diff --git a/packages/network/libsoup/build b/packages/network/libsoup/build index 4131180a61..13e93019de 100755 --- a/packages/network/libsoup/build +++ b/packages/network/libsoup/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libproxy #$SCRIPTS/build gnutls -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_path_GLIB_GENMARSHAL=$ROOT/$TOOLCHAIN/bin/glib-genmarshal \ soup_cv_ipv6="no" \ diff --git a/packages/network/libsoup/install b/packages/network/libsoup/install index eee04d7191..a475b32138 100755 --- a/packages/network/libsoup/install +++ b/packages/network/libsoup/install @@ -5,4 +5,4 @@ $SCRIPTS/install libproxy mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/$1/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/$1/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/network/wireless_tools/build b/packages/network/wireless_tools/build index b6244dfc76..065e1788d7 100755 --- a/packages/network/wireless_tools/build +++ b/packages/network/wireless_tools/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build linux -cd $BUILD/$1* +cd $PKG_BUILD make PREFIX=/usr \ CC=$CC \ diff --git a/packages/network/wireless_tools/install b/packages/network/wireless_tools/install index 9a2e8b1d55..1a45c4c053 100755 --- a/packages/network/wireless_tools/install +++ b/packages/network/wireless_tools/install @@ -3,10 +3,10 @@ . config/options mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/iwconfig $BUILD/$1*/iwpriv $INSTALL/usr/bin -[ "$DEVTOOLS" = yes ] && cp $BUILD/$1*/iwlist $INSTALL/usr/bin +cp $PKG_BUILD/iwconfig $PKG_BUILD/iwpriv $INSTALL/usr/bin +[ "$DEVTOOLS" = yes ] && cp $PKG_BUILD/iwlist $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/libiw.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libiw.so* $INSTALL/usr/lib exit 0 diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build index de9d954f9d..14fb3338b8 100755 --- a/packages/network/wpa_supplicant/build +++ b/packages/network/wpa_supplicant/build @@ -4,5 +4,5 @@ $SCRIPTS/build toolchain -cd $BUILD/$1*/wpa_supplicant +cd $PKG_BUILD/wpa_supplicant make diff --git a/packages/network/wpa_supplicant/install b/packages/network/wpa_supplicant/install index ff28309214..41505dba3a 100755 --- a/packages/network/wpa_supplicant/install +++ b/packages/network/wpa_supplicant/install @@ -4,4 +4,4 @@ mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/wpa_supplicant/wpa_supplicant $INSTALL/usr/bin +cp $PKG_BUILD/wpa_supplicant/wpa_supplicant $INSTALL/usr/bin diff --git a/packages/network/wpa_supplicant/unpack b/packages/network/wpa_supplicant/unpack index 0139e9458c..a815f71ae5 100755 --- a/packages/network/wpa_supplicant/unpack +++ b/packages/network/wpa_supplicant/unpack @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain PKG_DIR=`find $PACKAGES -type d -name $1` -WPA_SUPPLICANT=`ls -d $BUILD/$1*`/wpa_supplicant +WPA_SUPPLICANT=`ls -d $PKG_BUILD`/wpa_supplicant cp $PKG_DIR/config/makefile.config $WPA_SUPPLICANT/.config diff --git a/packages/other/bzip2/build b/packages/other/bzip2/build index 514ca2e911..6074078973 100755 --- a/packages/other/bzip2/build +++ b/packages/other/bzip2/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD #./configure --host=$TARGET_NAME \ # --build=$HOST_NAME \ # --prefix=/usr \ diff --git a/packages/other/bzip2/install b/packages/other/bzip2/install index f8ad68b9a1..27a87ea8dc 100755 --- a/packages/other/bzip2/install +++ b/packages/other/bzip2/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/*.so* $INSTALL/usr/lib diff --git a/packages/other/bzip2/unpack b/packages/other/bzip2/unpack index 9f2cb61a23..ee79b93161 100755 --- a/packages/other/bzip2/unpack +++ b/packages/other/bzip2/unpack @@ -2,7 +2,7 @@ . config/options -SRC_DIR=`ls -d $BUILD/$1*` +SRC_DIR=`ls -d $PKG_BUILD` BZIP2_VERSION=1.0.4 diff --git a/packages/other/clutter-cairo/build b/packages/other/clutter-cairo/build index d7c8bac6e8..dedc6a0a6a 100755 --- a/packages/other/clutter-cairo/build +++ b/packages/other/clutter-cairo/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build clutter $SCRIPTS/build cairo -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/clutter-cairo/install b/packages/other/clutter-cairo/install index 05aa1f940d..76a0e6644d 100755 --- a/packages/other/clutter-cairo/install +++ b/packages/other/clutter-cairo/install @@ -6,4 +6,4 @@ $SCRIPTS/install clutter $SCRIPTS/install cairo mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/other/clutter-gst/build b/packages/other/clutter-gst/build index a52d9b44c1..0dbb9c86d0 100755 --- a/packages/other/clutter-gst/build +++ b/packages/other/clutter-gst/build @@ -7,7 +7,7 @@ $SCRIPTS/build clutter $SCRIPTS/build gstreamer $SCRIPTS/build gst-plugins-base -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/clutter-gst/install b/packages/other/clutter-gst/install index 166ce01ceb..bdccc9ac72 100755 --- a/packages/other/clutter-gst/install +++ b/packages/other/clutter-gst/install @@ -7,4 +7,4 @@ $SCRIPTS/install gstreamer $SCRIPTS/install gst-plugins-base mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/clutter-gst/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/clutter-gst/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/other/clutter-gtk/build b/packages/other/clutter-gtk/build index 1ac6c703b5..926e6697d6 100755 --- a/packages/other/clutter-gtk/build +++ b/packages/other/clutter-gtk/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build clutter $SCRIPTS/build gtk+ -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/clutter-gtk/install b/packages/other/clutter-gtk/install index 99d9a9937a..ac493483b8 100755 --- a/packages/other/clutter-gtk/install +++ b/packages/other/clutter-gtk/install @@ -6,4 +6,4 @@ $SCRIPTS/install clutter $SCRIPTS/install gtk+ mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/clutter-gtk/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/clutter-gtk/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/other/clutter/build b/packages/other/clutter/build index 1d13df652e..328c5163a6 100755 --- a/packages/other/clutter/build +++ b/packages/other/clutter/build @@ -15,7 +15,7 @@ $SCRIPTS/build libXi $SCRIPTS/build glib $SCRIPTS/build gtk+ -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/clutter/install b/packages/other/clutter/install index d1b5bbf7e9..12bd608ad3 100755 --- a/packages/other/clutter/install +++ b/packages/other/clutter/install @@ -14,4 +14,4 @@ $SCRIPTS/install glib $SCRIPTS/install gtk+ mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/clutter/.libs/libclutter-glx*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/clutter/.libs/libclutter-glx*.so* $INSTALL/usr/lib diff --git a/packages/other/hicolor-icon-theme/build b/packages/other/hicolor-icon-theme/build index 319f2c1f40..66230dd090 100755 --- a/packages/other/hicolor-icon-theme/build +++ b/packages/other/hicolor-icon-theme/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/hicolor-icon-theme/install b/packages/other/hicolor-icon-theme/install index 645d9bec3f..9959b22d29 100755 --- a/packages/other/hicolor-icon-theme/install +++ b/packages/other/hicolor-icon-theme/install @@ -2,4 +2,4 @@ . config/options -cp -PR $BUILD/$1*/.install/* $INSTALL +cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/other/libdaemon/build b/packages/other/libdaemon/build index ba0d2f382e..a29de0748f 100755 --- a/packages/other/libdaemon/build +++ b/packages/other/libdaemon/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_func_setpgrp_void=no \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/other/libdaemon/install b/packages/other/libdaemon/install index 895a5fb510..dce51a02ec 100755 --- a/packages/other/libdaemon/install +++ b/packages/other/libdaemon/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/$1/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/$1/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/other/libgee/build b/packages/other/libgee/build index 3f11a47336..ff6db7dab2 100755 --- a/packages/other/libgee/build +++ b/packages/other/libgee/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/libgee/install b/packages/other/libgee/install index 3f6c6ffb8a..40692c6e6e 100755 --- a/packages/other/libgee/install +++ b/packages/other/libgee/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/gee/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/gee/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/other/libgpod/build b/packages/other/libgpod/build index b478345bd5..1c180b73a6 100755 --- a/packages/other/libgpod/build +++ b/packages/other/libgpod/build @@ -12,7 +12,7 @@ $SCRIPTS/build mutagen . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/libgpod/install b/packages/other/libgpod/install index a7845ca686..1c569072ce 100755 --- a/packages/other/libgpod/install +++ b/packages/other/libgpod/install @@ -11,8 +11,8 @@ $SCRIPTS/install mutagen PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib mkdir -p $PYTHON_LIB_DIR/site-packages/gpod -cp -PR $BUILD/$1*/bindings/python/.libs/*.so $PYTHON_LIB_DIR/site-packages/gpod -cp -PR $BUILD/$1*/bindings/python/*.pyc $PYTHON_LIB_DIR/site-packages/gpod \ No newline at end of file +cp -PR $PKG_BUILD/bindings/python/.libs/*.so $PYTHON_LIB_DIR/site-packages/gpod +cp -PR $PKG_BUILD/bindings/python/*.pyc $PYTHON_LIB_DIR/site-packages/gpod \ No newline at end of file diff --git a/packages/other/libiec61883/build b/packages/other/libiec61883/build index 0c161179db..347824bce8 100755 --- a/packages/other/libiec61883/build +++ b/packages/other/libiec61883/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libraw1394 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/libraw1394/build b/packages/other/libraw1394/build index 16cd69f236..7ab3236be3 100755 --- a/packages/other/libraw1394/build +++ b/packages/other/libraw1394/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/libtasn1/build b/packages/other/libtasn1/build index cd0c3828aa..0e8f4a7e38 100755 --- a/packages/other/libtasn1/build +++ b/packages/other/libtasn1/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/libv4l/build b/packages/other/libv4l/build index c9b11d37f2..a1c5d18b8c 100755 --- a/packages/other/libv4l/build +++ b/packages/other/libv4l/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libraw1394 -cd $BUILD/$1* +cd $PKG_BUILD make PREFIX=/usr LINKTYPE=static $MAKEINSTALL PREFIX=/usr LINKTYPE=static diff --git a/packages/other/libwsbm/build b/packages/other/libwsbm/build index c0ccd26515..56f424a122 100755 --- a/packages/other/libwsbm/build +++ b/packages/other/libwsbm/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build $LIBDRM -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/other/libwsbm/install b/packages/other/libwsbm/install index 67e3827dc7..9113c1b7e5 100755 --- a/packages/other/libwsbm/install +++ b/packages/other/libwsbm/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/other/module-init-tools/build b/packages/other/module-init-tools/build index 549694daaf..24c47a9f08 100755 --- a/packages/other/module-init-tools/build +++ b/packages/other/module-init-tools/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD ./configure make depmod diff --git a/packages/other/setserial/build b/packages/other/setserial/build index b7c1711541..f0b45b62e4 100755 --- a/packages/other/setserial/build +++ b/packages/other/setserial/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr diff --git a/packages/other/setserial/install b/packages/other/setserial/install index 574ad3b2a7..2eb91a6b27 100755 --- a/packages/other/setserial/install +++ b/packages/other/setserial/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/setserial $INSTALL/usr/bin +cp $PKG_BUILD/setserial $INSTALL/usr/bin diff --git a/packages/other/zlib/build b/packages/other/zlib/build index ab8273a759..9c131da5ca 100755 --- a/packages/other/zlib/build +++ b/packages/other/zlib/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --shared --prefix=/usr make diff --git a/packages/other/zlib/install b/packages/other/zlib/install index 12f2d211db..9d079d1749 100755 --- a/packages/other/zlib/install +++ b/packages/other/zlib/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/lib -cp -PR $BUILD/$1*/*.so* $INSTALL/lib +cp -PR $PKG_BUILD/*.so* $INSTALL/lib diff --git a/packages/print/freetype/build b/packages/print/freetype/build index ddb27091ba..ddd224845d 100755 --- a/packages/print/freetype/build +++ b/packages/print/freetype/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build zlib -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/print/freetype/install b/packages/print/freetype/install index c9b7252a95..f07e21a4c5 100755 --- a/packages/print/freetype/install +++ b/packages/print/freetype/install @@ -5,4 +5,4 @@ $SCRIPTS/install zlib mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/objs/.libs/libfreetype.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/objs/.libs/libfreetype.so* $INSTALL/usr/lib diff --git a/packages/print/freetype/unpack b/packages/print/freetype/unpack index d52cf1b88f..13e693fada 100755 --- a/packages/print/freetype/unpack +++ b/packages/print/freetype/unpack @@ -2,4 +2,4 @@ . config/options -$SCRIPTS/fixconfigtools $BUILD/$1*/builds/unix +$SCRIPTS/fixconfigtools $PKG_BUILD/builds/unix diff --git a/packages/python/databases/pysqlite/build b/packages/python/databases/pysqlite/build index 8248dde970..705cf552b2 100755 --- a/packages/python/databases/pysqlite/build +++ b/packages/python/databases/pysqlite/build @@ -8,7 +8,7 @@ $SCRIPTS/build sqlite . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py install --prefix /usr --root .install diff --git a/packages/python/databases/pysqlite/install b/packages/python/databases/pysqlite/install index 257fea3763..f72e6e8b16 100755 --- a/packages/python/databases/pysqlite/install +++ b/packages/python/databases/pysqlite/install @@ -5,7 +5,7 @@ $SCRIPTS/install Python $SCRIPTS/install sqlite -BUILD_DIR=`ls -d $BUILD/$1*` +BUILD_DIR=`ls -d $PKG_BUILD` . config/options.python diff --git a/packages/python/devel/TwistedCore.new/build b/packages/python/devel/TwistedCore.new/build index c1b6f9ce9c..101a996f08 100755 --- a/packages/python/devel/TwistedCore.new/build +++ b/packages/python/devel/TwistedCore.new/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py bdist_egg --exclude-source-files diff --git a/packages/python/devel/TwistedCore/build b/packages/python/devel/TwistedCore/build index 3283109db8..ebacb47ddd 100755 --- a/packages/python/devel/TwistedCore/build +++ b/packages/python/devel/TwistedCore/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py build diff --git a/packages/python/devel/TwistedCore/install b/packages/python/devel/TwistedCore/install index 41d34f849d..54d63efd2a 100755 --- a/packages/python/devel/TwistedCore/install +++ b/packages/python/devel/TwistedCore/install @@ -4,7 +4,7 @@ $SCRIPTS/install Python -BUILD_DIR=`ls -d $BUILD/$1*` +BUILD_DIR=`ls -d $PKG_BUILD` . config/options.python diff --git a/packages/python/devel/pygobject/build b/packages/python/devel/pygobject/build index a7cfa79bde..68944afd59 100755 --- a/packages/python/devel/pygobject/build +++ b/packages/python/devel/pygobject/build @@ -9,7 +9,7 @@ $SCRIPTS/build libffi . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/python/devel/pygobject/install b/packages/python/devel/pygobject/install index 5d9ced6f39..893f103b45 100755 --- a/packages/python/devel/pygobject/install +++ b/packages/python/devel/pygobject/install @@ -9,18 +9,18 @@ $SCRIPTS/install libffi PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $INSTALL/usr/lib -cp $BUILD/$1*/glib/.libs/libpyglib*.so* $INSTALL/usr/lib +cp $PKG_BUILD/glib/.libs/libpyglib*.so* $INSTALL/usr/lib mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject -cp $BUILD/$1*/dsextras.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0 -cp $BUILD/$1*/gobject/.libs/*.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject -cp $BUILD/$1*/gobject/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject +cp $PKG_BUILD/dsextras.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0 +cp $PKG_BUILD/gobject/.libs/*.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject +cp $PKG_BUILD/gobject/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib -cp $BUILD/$1*/glib/.libs/_glib.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib -cp $BUILD/$1*/glib/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib +cp $PKG_BUILD/glib/.libs/_glib.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib +cp $PKG_BUILD/glib/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio -cp $BUILD/$1*/gio/.libs/_gio.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio -cp $BUILD/$1*/gio/.libs/unix.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio -cp $BUILD/$1*/gio/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio +cp $PKG_BUILD/gio/.libs/_gio.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio +cp $PKG_BUILD/gio/.libs/unix.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio +cp $PKG_BUILD/gio/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio diff --git a/packages/python/devel/setuptools/build b/packages/python/devel/setuptools/build index 17387c67ad..612ab87fb6 100755 --- a/packages/python/devel/setuptools/build +++ b/packages/python/devel/setuptools/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py install --prefix=$ROOT/$TOOLCHAIN #$PYTHON setup.py install --prefix=/usr --root=./.install diff --git a/packages/python/devel/setuptools/install b/packages/python/devel/setuptools/install index bdd82972b6..75e024fbd4 100755 --- a/packages/python/devel/setuptools/install +++ b/packages/python/devel/setuptools/install @@ -4,7 +4,7 @@ $SCRIPTS/install Python -PKG_SRC_DIR=`ls -d $BUILD/$1*` +PKG_SRC_DIR=`ls -d $PKG_BUILD` . config/options.python diff --git a/packages/python/graphics/Imaging/build b/packages/python/graphics/Imaging/build index d6e371bde9..1a995aab67 100755 --- a/packages/python/graphics/Imaging/build +++ b/packages/python/graphics/Imaging/build @@ -11,7 +11,7 @@ $SCRIPTS/build jpeg . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD export INCLUDE_DIRS="$SYSROOT_PREFIX/usr/include" export LIB_DIRS="$SYSROOT_PREFIX/usr/lib" diff --git a/packages/python/graphics/Imaging/install b/packages/python/graphics/Imaging/install index 2167005bef..eb11154d1a 100755 --- a/packages/python/graphics/Imaging/install +++ b/packages/python/graphics/Imaging/install @@ -8,4 +8,4 @@ $SCRIPTS/install zlib $SCRIPTS/install freetype $SCRIPTS/install jpeg -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/graphics/pycairo/build b/packages/python/graphics/pycairo/build index 03b198cd5f..088b27633d 100755 --- a/packages/python/graphics/pycairo/build +++ b/packages/python/graphics/pycairo/build @@ -8,7 +8,7 @@ $SCRIPTS/build cairo . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/python/graphics/pycairo/install b/packages/python/graphics/pycairo/install index 0ca1151dec..22da424985 100755 --- a/packages/python/graphics/pycairo/install +++ b/packages/python/graphics/pycairo/install @@ -8,5 +8,5 @@ $SCRIPTS/install cairo PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages/cairo -cp $BUILD/$1*/cairo/.libs/*.so $PYTHON_LIB_DIR/site-packages/cairo -cp $BUILD/$1*/cairo/*.pyc $PYTHON_LIB_DIR/site-packages/cairo +cp $PKG_BUILD/cairo/.libs/*.so $PYTHON_LIB_DIR/site-packages/cairo +cp $PKG_BUILD/cairo/*.pyc $PYTHON_LIB_DIR/site-packages/cairo diff --git a/packages/python/multimedia/elisa-plugins-bad/build b/packages/python/multimedia/elisa-plugins-bad/build index fd28af8553..36ec71afb5 100755 --- a/packages/python/multimedia/elisa-plugins-bad/build +++ b/packages/python/multimedia/elisa-plugins-bad/build @@ -9,7 +9,7 @@ $SCRIPTS/build elisa PLUGINS_BAD="amazon amp avahi coherence daap database discogs dvd elisa_updater favorites filtered_shares gstreamer http_client ipod osso pigment poblesec rss search shelf themoviedb thetvdb" -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p dist for plugin in $PLUGINS_BAD; do diff --git a/packages/python/multimedia/elisa-plugins-bad/install b/packages/python/multimedia/elisa-plugins-bad/install index cc2f4938a7..4924d36350 100755 --- a/packages/python/multimedia/elisa-plugins-bad/install +++ b/packages/python/multimedia/elisa-plugins-bad/install @@ -12,5 +12,5 @@ $SCRIPTS/install Coherence PLUGINS_BAD="amazon amp avahi coherence daap database discogs dvd elisa_updater favorites filtered_shares gstreamer http_client ipod osso pigment poblesec rss search shelf themoviedb thetvdb" for plugin in $PLUGINS_BAD; do - $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $BUILD/$1*/elisa/plugins/$plugin/dist/*.egg + $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_BUILD/elisa/plugins/$plugin/dist/*.egg done diff --git a/packages/python/multimedia/elisa-plugins-good/build b/packages/python/multimedia/elisa-plugins-good/build index 9687df3c47..7e22319e7e 100755 --- a/packages/python/multimedia/elisa-plugins-good/build +++ b/packages/python/multimedia/elisa-plugins-good/build @@ -9,7 +9,7 @@ $SCRIPTS/build elisa PLUGINS_GOOD="base hal" -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p dist for plugin in $PLUGINS_GOOD; do diff --git a/packages/python/multimedia/elisa-plugins-good/install b/packages/python/multimedia/elisa-plugins-good/install index 39300b094b..80844f7492 100755 --- a/packages/python/multimedia/elisa-plugins-good/install +++ b/packages/python/multimedia/elisa-plugins-good/install @@ -9,5 +9,5 @@ $SCRIPTS/install Python PLUGINS_GOOD="base hal" for plugin in $PLUGINS_GOOD; do - $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $BUILD/$1*/elisa/plugins/$plugin/dist/*.egg + $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_BUILD/elisa/plugins/$plugin/dist/*.egg done diff --git a/packages/python/multimedia/elisa-plugins-ugly/build b/packages/python/multimedia/elisa-plugins-ugly/build index d3a6682c3d..c2aa1e5882 100755 --- a/packages/python/multimedia/elisa-plugins-ugly/build +++ b/packages/python/multimedia/elisa-plugins-ugly/build @@ -9,7 +9,7 @@ $SCRIPTS/build elisa PLUGINS_UGLY="flickr lirc shoutcast youtube" -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p dist for plugin in $PLUGINS_UGLY; do diff --git a/packages/python/multimedia/elisa-plugins-ugly/install b/packages/python/multimedia/elisa-plugins-ugly/install index 0024620d1d..22f4311a04 100755 --- a/packages/python/multimedia/elisa-plugins-ugly/install +++ b/packages/python/multimedia/elisa-plugins-ugly/install @@ -9,5 +9,5 @@ $SCRIPTS/install Python PLUGINS_UGLY="flickr lirc shoutcast youtube" for plugin in $PLUGINS_UGLY; do - $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $BUILD/$1*/elisa/plugins/$plugin/dist/*.egg + $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_BUILD/elisa/plugins/$plugin/dist/*.egg done diff --git a/packages/python/multimedia/elisa/build b/packages/python/multimedia/elisa/build index fe505e4aae..4c619e2f7d 100755 --- a/packages/python/multimedia/elisa/build +++ b/packages/python/multimedia/elisa/build @@ -19,7 +19,7 @@ $SCRIPTS/build twill . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py bdist_egg --exclude-source-files $PYTHON setup.py install_scripts --install-dir ./.install diff --git a/packages/python/multimedia/elisa/install b/packages/python/multimedia/elisa/install index 12a2a8a764..d8001c363f 100755 --- a/packages/python/multimedia/elisa/install +++ b/packages/python/multimedia/elisa/install @@ -28,7 +28,7 @@ PKG_SRC_DIR=`ls -d $BUILD/$1[-_][0-9]*` $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/.install/elisa $INSTALL/usr/bin +cp -PR $PKG_BUILD/.install/elisa $INSTALL/usr/bin mkdir -p $INSTALL/etc/X11/xinit/xinitrc.d cp -PR $PKG_DIR/scripts/xinitrc.d/* $INSTALL/etc/X11/xinit/xinitrc.d diff --git a/packages/python/multimedia/entertainer/build b/packages/python/multimedia/entertainer/build index 35cd6d07e5..d070020f36 100755 --- a/packages/python/multimedia/entertainer/build +++ b/packages/python/multimedia/entertainer/build @@ -11,7 +11,7 @@ $SCRIPTS/build setuptools PYTHON_LIB_DIR=`ls -d $SYSROOT_PREFIX/usr/lib/python*` -cd $BUILD/$1* +cd $PKG_BUILD # dirty hack for not existing file touch docs/LICENSE diff --git a/packages/python/multimedia/entertainer/install b/packages/python/multimedia/entertainer/install index c97fd5e694..09dc24c419 100755 --- a/packages/python/multimedia/entertainer/install +++ b/packages/python/multimedia/entertainer/install @@ -20,7 +20,7 @@ $SCRIPTS/install pyvorbis PKG_DIR=`find $PACKAGES -type d -name $1` -cp -PR $BUILD/$1*/.install/* $INSTALL +cp -PR $PKG_BUILD/.install/* $INSTALL mkdir -p $INSTALL/etc/X11/xinit/xinitrc.d cp -PR $PKG_DIR/scripts/xinitrc.d/* $INSTALL/etc/X11/xinit/xinitrc.d diff --git a/packages/python/multimedia/gnome-dvb-daemon/build b/packages/python/multimedia/gnome-dvb-daemon/build index e7ab66a9ef..9dd58600e4 100755 --- a/packages/python/multimedia/gnome-dvb-daemon/build +++ b/packages/python/multimedia/gnome-dvb-daemon/build @@ -16,7 +16,7 @@ $SCRIPTS/build libgee . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD py_cv_mod_gobject_=yes \ py_cv_mod_gtk_=yes \ py_cv_mod_dbus_=yes \ diff --git a/packages/python/multimedia/gnome-dvb-daemon/install b/packages/python/multimedia/gnome-dvb-daemon/install index 0f1e048054..16cd007f59 100755 --- a/packages/python/multimedia/gnome-dvb-daemon/install +++ b/packages/python/multimedia/gnome-dvb-daemon/install @@ -19,35 +19,35 @@ $SCRIPTS/install hicolor-icon-theme PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/$1 $INSTALL/usr/bin -cp -PR $BUILD/$1*/client/gnome-dvb-control $INSTALL/usr/bin +cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin +cp -PR $PKG_BUILD/client/gnome-dvb-control $INSTALL/usr/bin chmod +x $INSTALL/usr/bin/gnome-dvb-control -cp -PR $BUILD/$1*/client/gnome-dvb-setup $INSTALL/usr/bin +cp -PR $PKG_BUILD/client/gnome-dvb-setup $INSTALL/usr/bin chmod +x $INSTALL/usr/bin/gnome-dvb-setup mkdir -p $INSTALL/usr/share/dbus-1/services -cp -PR $BUILD/$1*/data/*.service $INSTALL/usr/share/dbus-1/services +cp -PR $PKG_BUILD/data/*.service $INSTALL/usr/share/dbus-1/services mkdir -p $PYTHON_LIB_DIR/site-packages/gnomedvb -cp $BUILD/$1*/client/gnomedvb/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb +cp $PKG_BUILD/client/gnomedvb/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb mkdir -p $PYTHON_LIB_DIR/site-packages/gnomedvb/ui -cp $BUILD/$1*/client/gnomedvb/ui/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui +cp $PKG_BUILD/client/gnomedvb/ui/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui mkdir -p $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/controlcenter -cp $BUILD/$1*/client/gnomedvb/ui/controlcenter/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/controlcenter +cp $PKG_BUILD/client/gnomedvb/ui/controlcenter/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/controlcenter mkdir -p $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/preferences -cp $BUILD/$1*/client/gnomedvb/ui/preferences/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/preferences +cp $PKG_BUILD/client/gnomedvb/ui/preferences/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/preferences mkdir -p $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/timers -cp $BUILD/$1*/client/gnomedvb/ui/timers/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/timers +cp $PKG_BUILD/client/gnomedvb/ui/timers/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/timers mkdir -p $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/widgets -cp $BUILD/$1*/client/gnomedvb/ui/widgets/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/widgets +cp $PKG_BUILD/client/gnomedvb/ui/widgets/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/widgets mkdir -p $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/wizard -cp $BUILD/$1*/client/gnomedvb/ui/wizard/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/wizard +cp $PKG_BUILD/client/gnomedvb/ui/wizard/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/wizard mkdir -p $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/wizard/pages -cp $BUILD/$1*/client/gnomedvb/ui/wizard/pages/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/wizard/pages +cp $PKG_BUILD/client/gnomedvb/ui/wizard/pages/*.pyc $PYTHON_LIB_DIR/site-packages/gnomedvb/ui/wizard/pages diff --git a/packages/python/multimedia/gst-python/build b/packages/python/multimedia/gst-python/build index d5720d0cba..87c474db07 100755 --- a/packages/python/multimedia/gst-python/build +++ b/packages/python/multimedia/gst-python/build @@ -11,7 +11,7 @@ $SCRIPTS/build gst-plugins-base . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_path_PYGTK_CODEGEN=`ls -d $ROOT/$BUILD/pygtk*/codegen/pygtk-codegen-2.0` \ ./configure --host=$TARGET_NAME \ diff --git a/packages/python/multimedia/gst-python/install b/packages/python/multimedia/gst-python/install index d3272c864b..71014fb1f7 100755 --- a/packages/python/multimedia/gst-python/install +++ b/packages/python/multimedia/gst-python/install @@ -11,16 +11,16 @@ $SCRIPTS/install gst-plugins-base PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages/ -cp $BUILD/$1*/pygst.pyc $PYTHON_LIB_DIR/site-packages/ -cp $BUILD/$1*/.libs/*.so $PYTHON_LIB_DIR/site-packages/ +cp $PKG_BUILD/pygst.pyc $PYTHON_LIB_DIR/site-packages/ +cp $PKG_BUILD/.libs/*.so $PYTHON_LIB_DIR/site-packages/ echo "gst-0.10" >> $PYTHON_LIB_DIR/site-packages/pygst.pth mkdir -p $PYTHON_LIB_DIR/site-packages/gst-0.10/gst -cp $BUILD/$1*/gst/.libs/*.so $PYTHON_LIB_DIR/site-packages/gst-0.10/gst -cp $BUILD/$1*/gst/*.pyc $PYTHON_LIB_DIR/site-packages/gst-0.10/gst +cp $PKG_BUILD/gst/.libs/*.so $PYTHON_LIB_DIR/site-packages/gst-0.10/gst +cp $PKG_BUILD/gst/*.pyc $PYTHON_LIB_DIR/site-packages/gst-0.10/gst mkdir -p $PYTHON_LIB_DIR/site-packages/gst-0.10/gst/extend -cp $BUILD/$1*/gst/extend/*.pyc $PYTHON_LIB_DIR/site-packages/gst-0.10/gst/extend +cp $PKG_BUILD/gst/extend/*.pyc $PYTHON_LIB_DIR/site-packages/gst-0.10/gst/extend mkdir -p $INSTALL/usr/share/gst-python/0.10/defs -cp $BUILD/$1*/gst/*.defs $INSTALL/usr/share/gst-python/0.10/defs \ No newline at end of file +cp $PKG_BUILD/gst/*.defs $INSTALL/usr/share/gst-python/0.10/defs \ No newline at end of file diff --git a/packages/python/multimedia/mutagen/build b/packages/python/multimedia/mutagen/build index bac9263e9b..4dc84e72a3 100755 --- a/packages/python/multimedia/mutagen/build +++ b/packages/python/multimedia/mutagen/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py build $PYTHON setup.py install -O1 --skip-build --prefix /usr --root $SYSROOT_PREFIX diff --git a/packages/python/multimedia/mutagen/install b/packages/python/multimedia/mutagen/install index 40cd5f4fad..19d1a57e8b 100755 --- a/packages/python/multimedia/mutagen/install +++ b/packages/python/multimedia/mutagen/install @@ -4,4 +4,4 @@ $SCRIPTS/install Python -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/multimedia/pigment-python/build b/packages/python/multimedia/pigment-python/build index a81e695242..2e93bcb0ba 100755 --- a/packages/python/multimedia/pigment-python/build +++ b/packages/python/multimedia/pigment-python/build @@ -9,7 +9,7 @@ $SCRIPTS/build gst-python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/python/multimedia/pigment-python/install b/packages/python/multimedia/pigment-python/install index d6c5e811c4..3a2467685d 100755 --- a/packages/python/multimedia/pigment-python/install +++ b/packages/python/multimedia/pigment-python/install @@ -9,19 +9,19 @@ $SCRIPTS/install gst-python PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages -cp $BUILD/$1*/pgm/.libs/_pgm*.so $PYTHON_LIB_DIR/site-packages +cp $PKG_BUILD/pgm/.libs/_pgm*.so $PYTHON_LIB_DIR/site-packages mkdir -p $PYTHON_LIB_DIR/site-packages/pgm -cp $BUILD/$1*/pgm/*.py $PYTHON_LIB_DIR/site-packages/pgm +cp $PKG_BUILD/pgm/*.py $PYTHON_LIB_DIR/site-packages/pgm mkdir -p $PYTHON_LIB_DIR/site-packages/pgm/graph -cp $BUILD/$1*/pgm/graph/*.py $PYTHON_LIB_DIR/site-packages/pgm/graph +cp $PKG_BUILD/pgm/graph/*.py $PYTHON_LIB_DIR/site-packages/pgm/graph mkdir -p $PYTHON_LIB_DIR/site-packages/pgm/timing -cp $BUILD/$1*/pgm/timing/*.py $PYTHON_LIB_DIR/site-packages/pgm/timing +cp $PKG_BUILD/pgm/timing/*.py $PYTHON_LIB_DIR/site-packages/pgm/timing mkdir -p $PYTHON_LIB_DIR/site-packages/pgm/utils -cp $BUILD/$1*/pgm/utils/*.py $PYTHON_LIB_DIR/site-packages/pgm/utils +cp $PKG_BUILD/pgm/utils/*.py $PYTHON_LIB_DIR/site-packages/pgm/utils mkdir -p $PYTHON_LIB_DIR/site-packages/pgm/widgets -cp $BUILD/$1*/pgm/widgets/*.py $PYTHON_LIB_DIR/site-packages/pgm/widgets +cp $PKG_BUILD/pgm/widgets/*.py $PYTHON_LIB_DIR/site-packages/pgm/widgets diff --git a/packages/python/multimedia/pyclutter/build b/packages/python/multimedia/pyclutter/build index 0af9dea395..df6c3c1ec9 100755 --- a/packages/python/multimedia/pyclutter/build +++ b/packages/python/multimedia/pyclutter/build @@ -14,7 +14,7 @@ $SCRIPTS/build clutter-cairo . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD #ac_cv_path_PYGTK_CODEGEN=`ls -d $ROOT/$BUILD/pygtk*/codegen/pygtk-codegen-2.0` \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/python/multimedia/pyclutter/install b/packages/python/multimedia/pyclutter/install index 09e260217f..71941ffa2d 100755 --- a/packages/python/multimedia/pyclutter/install +++ b/packages/python/multimedia/pyclutter/install @@ -14,20 +14,20 @@ $SCRIPTS/install clutter-cairo PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages/clutter -cp $BUILD/$1*/clutter/.libs/*.so $PYTHON_LIB_DIR/site-packages/clutter -cp $BUILD/$1*/clutter/*.pyc $PYTHON_LIB_DIR/site-packages/clutter +cp $PKG_BUILD/clutter/.libs/*.so $PYTHON_LIB_DIR/site-packages/clutter +cp $PKG_BUILD/clutter/*.pyc $PYTHON_LIB_DIR/site-packages/clutter mkdir -p $INSTALL/usr/share/pyclutter/1.0/defs -cp $BUILD/$1*/clutter/*.defs $INSTALL/usr/share/pyclutter/1.0/defs +cp $PKG_BUILD/clutter/*.defs $INSTALL/usr/share/pyclutter/1.0/defs mkdir -p $PYTHON_LIB_DIR/site-packages/cluttercairo -cp $BUILD/$1*/clutter-cairo/.libs/*.so $PYTHON_LIB_DIR/site-packages/cluttercairo -cp $BUILD/$1*/clutter-cairo/*.pyc $PYTHON_LIB_DIR/site-packages/cluttercairo +cp $PKG_BUILD/clutter-cairo/.libs/*.so $PYTHON_LIB_DIR/site-packages/cluttercairo +cp $PKG_BUILD/clutter-cairo/*.pyc $PYTHON_LIB_DIR/site-packages/cluttercairo mkdir -p $PYTHON_LIB_DIR/site-packages/cluttergst -cp $BUILD/$1*/clutter-gst/.libs/*.so $PYTHON_LIB_DIR/site-packages/cluttergst -cp $BUILD/$1*/clutter-gst/*.pyc $PYTHON_LIB_DIR/site-packages/cluttergst +cp $PKG_BUILD/clutter-gst/.libs/*.so $PYTHON_LIB_DIR/site-packages/cluttergst +cp $PKG_BUILD/clutter-gst/*.pyc $PYTHON_LIB_DIR/site-packages/cluttergst mkdir -p $PYTHON_LIB_DIR/site-packages/cluttergtk -cp $BUILD/$1*/clutter-gtk/.libs/*.so $PYTHON_LIB_DIR/site-packages/cluttergtk -cp $BUILD/$1*/clutter-gtk/*.pyc $PYTHON_LIB_DIR/site-packages/cluttergtk +cp $PKG_BUILD/clutter-gtk/.libs/*.so $PYTHON_LIB_DIR/site-packages/cluttergtk +cp $PKG_BUILD/clutter-gtk/*.pyc $PYTHON_LIB_DIR/site-packages/cluttergtk diff --git a/packages/python/net/Coherence/build b/packages/python/net/Coherence/build index 1a4739c60b..85270e13d5 100755 --- a/packages/python/net/Coherence/build +++ b/packages/python/net/Coherence/build @@ -7,6 +7,6 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py bdist_egg --exclude-source-files diff --git a/packages/python/other/CDDB/build b/packages/python/other/CDDB/build index 04f5348147..f88dc7cb93 100755 --- a/packages/python/other/CDDB/build +++ b/packages/python/other/CDDB/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py install --prefix /usr --root .install find .install -name "*.py" -exec rm -rf "{}" ";" diff --git a/packages/python/other/CDDB/install b/packages/python/other/CDDB/install index 40cd5f4fad..19d1a57e8b 100755 --- a/packages/python/other/CDDB/install +++ b/packages/python/other/CDDB/install @@ -4,4 +4,4 @@ $SCRIPTS/install Python -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/other/IMDbPY/build b/packages/python/other/IMDbPY/build index bf5cdb5914..ef5c5f8b61 100755 --- a/packages/python/other/IMDbPY/build +++ b/packages/python/other/IMDbPY/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py install --prefix /usr --root .install find .install -name "*.py" -exec rm -rf "{}" ";" diff --git a/packages/python/other/IMDbPY/install b/packages/python/other/IMDbPY/install index 40cd5f4fad..19d1a57e8b 100755 --- a/packages/python/other/IMDbPY/install +++ b/packages/python/other/IMDbPY/install @@ -4,4 +4,4 @@ $SCRIPTS/install Python -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/other/eyeD3/build b/packages/python/other/eyeD3/build index b585b79073..a059884ee3 100755 --- a/packages/python/other/eyeD3/build +++ b/packages/python/other/eyeD3/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/python/other/eyeD3/install b/packages/python/other/eyeD3/install index 40cd5f4fad..19d1a57e8b 100755 --- a/packages/python/other/eyeD3/install +++ b/packages/python/other/eyeD3/install @@ -4,4 +4,4 @@ $SCRIPTS/install Python -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/other/feedparser/build b/packages/python/other/feedparser/build index 04f5348147..f88dc7cb93 100755 --- a/packages/python/other/feedparser/build +++ b/packages/python/other/feedparser/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py install --prefix /usr --root .install find .install -name "*.py" -exec rm -rf "{}" ";" diff --git a/packages/python/other/feedparser/install b/packages/python/other/feedparser/install index 40cd5f4fad..19d1a57e8b 100755 --- a/packages/python/other/feedparser/install +++ b/packages/python/other/feedparser/install @@ -4,4 +4,4 @@ $SCRIPTS/install Python -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/other/pyOpenSSL/build b/packages/python/other/pyOpenSSL/build index 04f5348147..f88dc7cb93 100755 --- a/packages/python/other/pyOpenSSL/build +++ b/packages/python/other/pyOpenSSL/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py install --prefix /usr --root .install find .install -name "*.py" -exec rm -rf "{}" ";" diff --git a/packages/python/other/pyOpenSSL/install b/packages/python/other/pyOpenSSL/install index 40cd5f4fad..19d1a57e8b 100755 --- a/packages/python/other/pyOpenSSL/install +++ b/packages/python/other/pyOpenSSL/install @@ -4,4 +4,4 @@ $SCRIPTS/install Python -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/other/pyogg/build b/packages/python/other/pyogg/build index 6f12c3e5b3..ada7b29349 100755 --- a/packages/python/other/pyogg/build +++ b/packages/python/other/pyogg/build @@ -10,7 +10,7 @@ $SCRIPTS/build libogg PYTHON_LIB_DIR=`ls -d $SYSROOT_PREFIX/usr/lib/python*` -cd $BUILD/$1* +cd $PKG_BUILD echo "ogg_include_dir = $SYSROOT_PREFIX/usr/include" > Setup echo "ogg_lib_dir = $SYSROOT_PREFIX/usr/lib" >> Setup diff --git a/packages/python/other/pyogg/install b/packages/python/other/pyogg/install index 1a341f21cd..b04b917af8 100755 --- a/packages/python/other/pyogg/install +++ b/packages/python/other/pyogg/install @@ -8,6 +8,6 @@ $SCRIPTS/install libogg PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages/ogg -cp $BUILD/$1*/build/lib*/*/*.so $PYTHON_LIB_DIR/site-packages/ogg -cp $BUILD/$1*/build/lib*/*/*.pyc $PYTHON_LIB_DIR/site-packages/ogg -cp $BUILD/$1*/PKG-INFO $PYTHON_LIB_DIR/site-packages/pyogg-1.3-py2.6.egg-info \ No newline at end of file +cp $PKG_BUILD/build/lib*/*/*.so $PYTHON_LIB_DIR/site-packages/ogg +cp $PKG_BUILD/build/lib*/*/*.pyc $PYTHON_LIB_DIR/site-packages/ogg +cp $PKG_BUILD/PKG-INFO $PYTHON_LIB_DIR/site-packages/pyogg-1.3-py2.6.egg-info \ No newline at end of file diff --git a/packages/python/other/pyvorbis/build b/packages/python/other/pyvorbis/build index b829ff435f..c6efb4b9ff 100755 --- a/packages/python/other/pyvorbis/build +++ b/packages/python/other/pyvorbis/build @@ -11,7 +11,7 @@ $SCRIPTS/build libvorbis PYTHON_LIB_DIR=`ls -d $SYSROOT_PREFIX/usr/lib/python*` -cd $BUILD/$1* +cd $PKG_BUILD echo "ogg_include_dir = $SYSROOT_PREFIX/usr/include" > Setup echo "ogg_lib_dir = $SYSROOT_PREFIX/usr/lib" >> Setup diff --git a/packages/python/other/pyvorbis/install b/packages/python/other/pyvorbis/install index 3edb9521f0..cfe4dfe1d6 100755 --- a/packages/python/other/pyvorbis/install +++ b/packages/python/other/pyvorbis/install @@ -9,5 +9,5 @@ $SCRIPTS/install libvorbis PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages/ogg -cp $BUILD/$1*/build/lib*/*/*.so $PYTHON_LIB_DIR/site-packages/ogg -cp $BUILD/$1*/PKG-INFO $PYTHON_LIB_DIR/site-packages/pyvorbis-1.4-py2.6.egg-info \ No newline at end of file +cp $PKG_BUILD/build/lib*/*/*.so $PYTHON_LIB_DIR/site-packages/ogg +cp $PKG_BUILD/PKG-INFO $PYTHON_LIB_DIR/site-packages/pyvorbis-1.4-py2.6.egg-info \ No newline at end of file diff --git a/packages/python/sysutils/cssutils/build b/packages/python/sysutils/cssutils/build index 1a4739c60b..85270e13d5 100755 --- a/packages/python/sysutils/cssutils/build +++ b/packages/python/sysutils/cssutils/build @@ -7,6 +7,6 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py bdist_egg --exclude-source-files diff --git a/packages/python/sysutils/dbus-python/build b/packages/python/sysutils/dbus-python/build index e03c85c86f..294bc2cd36 100755 --- a/packages/python/sysutils/dbus-python/build +++ b/packages/python/sysutils/dbus-python/build @@ -8,7 +8,7 @@ $SCRIPTS/build dbus . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/python/sysutils/dbus-python/install b/packages/python/sysutils/dbus-python/install index e2c3a91d29..cf24f42f17 100755 --- a/packages/python/sysutils/dbus-python/install +++ b/packages/python/sysutils/dbus-python/install @@ -8,12 +8,12 @@ $SCRIPTS/install dbus PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages -cp -PR $BUILD/$1*/_dbus_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages -cp -PR $BUILD/$1*/_dbus_glib_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages -cp -PR $BUILD/$1*/*.pyc $PYTHON_LIB_DIR/site-packages +cp -PR $PKG_BUILD/_dbus_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages +cp -PR $PKG_BUILD/_dbus_glib_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages +cp -PR $PKG_BUILD/*.pyc $PYTHON_LIB_DIR/site-packages mkdir -p $PYTHON_LIB_DIR/site-packages/dbus -cp -PR $BUILD/$1*/dbus/*.pyc $PYTHON_LIB_DIR/site-packages/dbus +cp -PR $PKG_BUILD/dbus/*.pyc $PYTHON_LIB_DIR/site-packages/dbus mkdir -p $PYTHON_LIB_DIR/site-packages/dbus/mainloop -cp -PR $BUILD/$1*/dbus/mainloop/*.pyc $PYTHON_LIB_DIR/site-packages/dbus/mainloop +cp -PR $PKG_BUILD/dbus/mainloop/*.pyc $PYTHON_LIB_DIR/site-packages/dbus/mainloop diff --git a/packages/python/sysutils/pymetar/build b/packages/python/sysutils/pymetar/build index 7dafddbad3..97660aedab 100755 --- a/packages/python/sysutils/pymetar/build +++ b/packages/python/sysutils/pymetar/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py build diff --git a/packages/python/sysutils/pymetar/install b/packages/python/sysutils/pymetar/install index 40cd5f4fad..19d1a57e8b 100755 --- a/packages/python/sysutils/pymetar/install +++ b/packages/python/sysutils/pymetar/install @@ -4,4 +4,4 @@ $SCRIPTS/install Python -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/sysutils/twill/build b/packages/python/sysutils/twill/build index b9c82e228b..665bc824da 100755 --- a/packages/python/sysutils/twill/build +++ b/packages/python/sysutils/twill/build @@ -7,7 +7,7 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py build diff --git a/packages/python/sysutils/twill/install b/packages/python/sysutils/twill/install index 40cd5f4fad..19d1a57e8b 100755 --- a/packages/python/sysutils/twill/install +++ b/packages/python/sysutils/twill/install @@ -4,4 +4,4 @@ $SCRIPTS/install Python -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/www/TwistedWeb.new/build b/packages/python/www/TwistedWeb.new/build index 8814152ff9..369fc5b795 100755 --- a/packages/python/www/TwistedWeb.new/build +++ b/packages/python/www/TwistedWeb.new/build @@ -8,7 +8,7 @@ $SCRIPTS/build TwistedCore . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py bdist_egg --exclude-source-files diff --git a/packages/python/www/TwistedWeb/build b/packages/python/www/TwistedWeb/build index 949edf89f7..1da524ad52 100755 --- a/packages/python/www/TwistedWeb/build +++ b/packages/python/www/TwistedWeb/build @@ -8,7 +8,7 @@ $SCRIPTS/build TwistedCore . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py build diff --git a/packages/python/www/TwistedWeb/install b/packages/python/www/TwistedWeb/install index 6e34a28286..8c1ed6a87d 100755 --- a/packages/python/www/TwistedWeb/install +++ b/packages/python/www/TwistedWeb/install @@ -5,4 +5,4 @@ $SCRIPTS/install Python $SCRIPTS/install TwistedCore -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/www/TwistedWeb2.new/build b/packages/python/www/TwistedWeb2.new/build index 0bd0357c3c..8704ed17c1 100755 --- a/packages/python/www/TwistedWeb2.new/build +++ b/packages/python/www/TwistedWeb2.new/build @@ -8,7 +8,7 @@ $SCRIPTS/build TwistedCore . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py bdist_egg --exclude-source-files diff --git a/packages/python/www/TwistedWeb2/build b/packages/python/www/TwistedWeb2/build index 15d097652d..139ba18458 100755 --- a/packages/python/www/TwistedWeb2/build +++ b/packages/python/www/TwistedWeb2/build @@ -8,7 +8,7 @@ $SCRIPTS/build TwistedCore . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py build diff --git a/packages/python/www/TwistedWeb2/install b/packages/python/www/TwistedWeb2/install index 6e34a28286..8c1ed6a87d 100755 --- a/packages/python/www/TwistedWeb2/install +++ b/packages/python/www/TwistedWeb2/install @@ -5,4 +5,4 @@ $SCRIPTS/install Python $SCRIPTS/install TwistedCore -cp -PR $BUILD/$1*/.install/* $INSTALL \ No newline at end of file +cp -PR $PKG_BUILD/.install/* $INSTALL \ No newline at end of file diff --git a/packages/python/www/zope.interface/build b/packages/python/www/zope.interface/build index 3fe5fac842..ae044ee042 100755 --- a/packages/python/www/zope.interface/build +++ b/packages/python/www/zope.interface/build @@ -7,5 +7,5 @@ $SCRIPTS/build Python . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD $PYTHON setup.py bdist_egg --exclude-source-files diff --git a/packages/python/www/zope.interface/install b/packages/python/www/zope.interface/install index 3ed2d8cc72..9d22bb571f 100755 --- a/packages/python/www/zope.interface/install +++ b/packages/python/www/zope.interface/install @@ -6,6 +6,6 @@ $SCRIPTS/install Python . config/options.python -PKG_SRC_DIR=`ls -d $BUILD/$1*` +PKG_SRC_DIR=`ls -d $PKG_BUILD` $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg diff --git a/packages/python/x11-toolkits/pygtk/build b/packages/python/x11-toolkits/pygtk/build index d77c20f4bf..f2e318d7f3 100755 --- a/packages/python/x11-toolkits/pygtk/build +++ b/packages/python/x11-toolkits/pygtk/build @@ -14,7 +14,7 @@ $SCRIPTS/build pycairo . config/options.python -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/python/x11-toolkits/pygtk/install b/packages/python/x11-toolkits/pygtk/install index 4f02017fe6..66a484c4dd 100755 --- a/packages/python/x11-toolkits/pygtk/install +++ b/packages/python/x11-toolkits/pygtk/install @@ -13,15 +13,15 @@ PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` PYTHON_SYSROOTLIB_DIR=`ls -d $SYSROOT_PREFIX/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/ - cp $BUILD/$1*/gtk/.libs/gtkunixprint.so $PYTHON_LIB_DIR/site-packages/gtk-2.0 - cp $BUILD/$1*/.libs/atk.so $PYTHON_LIB_DIR/site-packages/gtk-2.0 - cp $BUILD/$1*/.libs/pango.so $PYTHON_LIB_DIR/site-packages/gtk-2.0 - cp $BUILD/$1*/.libs/pangocairo.so $PYTHON_LIB_DIR/site-packages/gtk-2.0 + cp $PKG_BUILD/gtk/.libs/gtkunixprint.so $PYTHON_LIB_DIR/site-packages/gtk-2.0 + cp $PKG_BUILD/.libs/atk.so $PYTHON_LIB_DIR/site-packages/gtk-2.0 + cp $PKG_BUILD/.libs/pango.so $PYTHON_LIB_DIR/site-packages/gtk-2.0 + cp $PKG_BUILD/.libs/pangocairo.so $PYTHON_LIB_DIR/site-packages/gtk-2.0 mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gtk - cp $BUILD/$1*/gtk/.libs/_gtk.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gtk + cp $PKG_BUILD/gtk/.libs/_gtk.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gtk [ "$MEDIACENTER" = entertainer ] && \ - cp $BUILD/$1*/gtk/.libs/glade.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gtk - cp $BUILD/$1*/gtk/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gtk + cp $PKG_BUILD/gtk/.libs/glade.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gtk + cp $PKG_BUILD/gtk/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gtk cp $PYTHON_SYSROOTLIB_DIR/site-packages/pygtk.pyc $PYTHON_LIB_DIR/site-packages cp $PYTHON_SYSROOTLIB_DIR/site-packages/pygtk.pth $PYTHON_LIB_DIR/site-packages diff --git a/packages/security/gnutls/build b/packages/security/gnutls/build index 9b1727a2d8..791729d1d2 100755 --- a/packages/security/gnutls/build +++ b/packages/security/gnutls/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libtasn1 $SCRIPTS/build libgcrypt -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/security/gnutls/install b/packages/security/gnutls/install index 67e3827dc7..9113c1b7e5 100755 --- a/packages/security/gnutls/install +++ b/packages/security/gnutls/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/security/libgcrypt/build b/packages/security/libgcrypt/build index de97a35a7f..e935da3fd0 100755 --- a/packages/security/libgcrypt/build +++ b/packages/security/libgcrypt/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libgpg-error -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/security/libgcrypt/install b/packages/security/libgcrypt/install index 868e327893..121f6f0849 100755 --- a/packages/security/libgcrypt/install +++ b/packages/security/libgcrypt/install @@ -5,4 +5,4 @@ $SCRIPTS/build libgpg-error mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/security/libgpg-error/build b/packages/security/libgpg-error/build index febd1adb80..e2da67fb0d 100755 --- a/packages/security/libgpg-error/build +++ b/packages/security/libgpg-error/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/security/libgpg-error/install b/packages/security/libgpg-error/install index 67e3827dc7..9113c1b7e5 100755 --- a/packages/security/libgpg-error/install +++ b/packages/security/libgpg-error/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/security/openssl/build b/packages/security/openssl/build index 3df8893d2a..225e52c94e 100755 --- a/packages/security/openssl/build +++ b/packages/security/openssl/build @@ -22,7 +22,7 @@ case $TARGET_ARCH in ;; esac -cd $BUILD/$1* +cd $PKG_BUILD ./Configure zlib-dynamic no-shared no-dso no-krb5 --prefix=$SYSROOT_PREFIX/usr $TARGET make CC=$CC LD=$LD RANLIB=$RANLIB diff --git a/packages/sysutils/automountd/build b/packages/sysutils/automountd/build index 9c9cf877a4..49dfb54761 100755 --- a/packages/sysutils/automountd/build +++ b/packages/sysutils/automountd/build @@ -7,4 +7,4 @@ $SCRIPTS/build dbus $SCRIPTS/build dbus-glib $SCRIPTS/build hal -make -C $BUILD/$1* +make -C $PKG_BUILD diff --git a/packages/sysutils/busybox/build b/packages/sysutils/busybox/build index b70d789cd5..9064d7eb17 100755 --- a/packages/sysutils/busybox/build +++ b/packages/sysutils/busybox/build @@ -12,7 +12,7 @@ else BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf fi -cd $BUILD/$1* +cd $PKG_BUILD # Build Busybox for initramfs make distclean cp $ROOT/$PKG_DIR/config/$1-initramfs.conf .config diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 9e71caa543..c9160e9c88 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -7,13 +7,13 @@ PKG_DIR=`find $PACKAGES -type d -name $1` if [ "$2" = initramfs ]; then mkdir -p $INSTALL/$2 - cp -PR $BUILD/$1*/_install-$2/* $INSTALL/$2 + cp -PR $PKG_BUILD/_install-$2/* $INSTALL/$2 cp $PKG_DIR/scripts/init.$2 $INSTALL/$2 fi if [ "$2" = system ]; then - cp -PR $BUILD/$1*/_install-$2/* $INSTALL + cp -PR $PKG_BUILD/_install-$2/* $INSTALL mkdir -p $INSTALL/bin ln -sf /bin/sh $INSTALL/bin/bash diff --git a/packages/sysutils/busybox/unpack b/packages/sysutils/busybox/unpack index fc7c2f7c48..ba540f667b 100755 --- a/packages/sysutils/busybox/unpack +++ b/packages/sysutils/busybox/unpack @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -BUSYBOX=`ls -d $BUILD/$1*` +BUSYBOX=`ls -d $PKG_BUILD` cat <>$BUSYBOX/Makefile.custom HOSTCC = $HOST_CC diff --git a/packages/sysutils/hal/build b/packages/sysutils/hal/build index cfa4c1f65f..d53f5f6f0c 100755 --- a/packages/sysutils/hal/build +++ b/packages/sysutils/hal/build @@ -3,7 +3,7 @@ . config/options $SCRIPTS/build toolchain -$SCRIPTS/build gettext +$SCRIPTS/build gettext-dummy $SCRIPTS/build pciutils $SCRIPTS/build udev $SCRIPTS/build expat @@ -15,7 +15,8 @@ $SCRIPTS/build util-linux-ng export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include" export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib" -cd $BUILD/$1* +echo $PKG_BUILD +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/sysutils/hal/install b/packages/sysutils/hal/install index 3820448609..b8a459981f 100755 --- a/packages/sysutils/hal/install +++ b/packages/sysutils/hal/install @@ -7,84 +7,84 @@ $SCRIPTS/install glib $SCRIPTS/install udev $SCRIPTS/install dbus $SCRIPTS/install dbus-glib -$SCRIPTS/install gettext +$SCRIPTS/install gettext-dummy mkdir -p $INSTALL/usr/sbin -cp $BUILD/$1*/hald/hald $INSTALL/usr/sbin/ +cp $PKG_BUILD/hald/hald $INSTALL/usr/sbin/ mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/lshal $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hal-device $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hal-disable-polling $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hal-find-by-capability $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hal-find-by-property $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hal-get-property $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hal-is-caller-locked-out $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hal-lock $INSTALL/usr/bin -cp $BUILD/$1*/tools/.libs/hal-set-property $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/lshal $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hal-device $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hal-disable-polling $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hal-find-by-capability $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hal-find-by-property $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hal-get-property $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hal-is-caller-locked-out $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hal-lock $INSTALL/usr/bin +cp $PKG_BUILD/tools/.libs/hal-set-property $INSTALL/usr/bin mkdir -p $INSTALL/usr/libexec -#cp $BUILD/$1*/tools/linux/.libs/hal-ipw-killswitch-linux $INSTALL/usr/libexec -cp $BUILD/$1*/tools/.libs/hal-storage-mount $INSTALL/usr/libexec -#cp $BUILD/$1*/tools/.libs/hal-storage-umount $INSTALL/usr/libexec -cp $BUILD/$1*/tools/.libs/hal-storage-eject $INSTALL/usr/libexec -cp $BUILD/$1*/tools/.libs/hal-storage-closetray $INSTALL/usr/libexec -cp $BUILD/$1*/tools/.libs/hal-storage-cleanup-mountpoint $INSTALL/usr/libexec -cp $BUILD/$1*/tools/.libs/hal-storage-cleanup-all-mountpoints $INSTALL/usr/libexec -#cp $BUILD/$1*/tools/hal-system-setserial $INSTALL/usr/libexec -#cp $BUILD/$1*/tools/.libs/hal-system-power-pm-is-supported $INSTALL/usr/libexec -cp $BUILD/$1*/hald/linux/addons/.libs/hald-addon-* $INSTALL/usr/libexec -cp $BUILD/$1*/hald/linux/probing/.libs/hald-probe-* $INSTALL/usr/libexec -cp $BUILD/$1*/hald/hald-generate-fdi-cache $INSTALL/usr/libexec -cp $BUILD/$1*/hald-runner/hald-runner $INSTALL/usr/libexec +#cp $PKG_BUILD/tools/linux/.libs/hal-ipw-killswitch-linux $INSTALL/usr/libexec +cp $PKG_BUILD/tools/.libs/hal-storage-mount $INSTALL/usr/libexec +#cp $PKG_BUILD/tools/.libs/hal-storage-umount $INSTALL/usr/libexec +cp $PKG_BUILD/tools/.libs/hal-storage-eject $INSTALL/usr/libexec +cp $PKG_BUILD/tools/.libs/hal-storage-closetray $INSTALL/usr/libexec +cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-mountpoint $INSTALL/usr/libexec +cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-all-mountpoints $INSTALL/usr/libexec +#cp $PKG_BUILD/tools/hal-system-setserial $INSTALL/usr/libexec +#cp $PKG_BUILD/tools/.libs/hal-system-power-pm-is-supported $INSTALL/usr/libexec +cp $PKG_BUILD/hald/linux/addons/.libs/hald-addon-* $INSTALL/usr/libexec +cp $PKG_BUILD/hald/linux/probing/.libs/hald-probe-* $INSTALL/usr/libexec +cp $PKG_BUILD/hald/hald-generate-fdi-cache $INSTALL/usr/libexec +cp $PKG_BUILD/hald-runner/hald-runner $INSTALL/usr/libexec mkdir -p $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-luks-* $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-power-suspend $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-power-suspend-hybrid $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-power-hibernate $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-power-shutdown $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-power-reboot $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-lcd-get-brightness $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-lcd-set-brightness $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-power-set-power-save $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-killswitch-get-power $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-killswitch-set-power $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-wol-supported $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-wol-enabled $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/hal-system-wol-enable $INSTALL/usr/lib/hal/scripts -cp $BUILD/$1*/tools/hal-functions $INSTALL/usr/lib/hal/scripts -cp $BUILD/$1*/tools/hal-dockstation-undock $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-luks-* $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-power-suspend $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-power-suspend-hybrid $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-power-hibernate $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-power-shutdown $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-power-reboot $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-lcd-get-brightness $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-lcd-set-brightness $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-power-set-power-save $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-killswitch-get-power $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-killswitch-set-power $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-wol-supported $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-wol-enabled $INSTALL/usr/lib/hal/scripts +#cp $PKG_BUILD/tools/hal-system-wol-enable $INSTALL/usr/lib/hal/scripts +cp $PKG_BUILD/tools/hal-functions $INSTALL/usr/lib/hal/scripts +cp $PKG_BUILD/tools/hal-dockstation-undock $INSTALL/usr/lib/hal/scripts -#cp $BUILD/$1*/tools/.libs/hal-setup-keymap $INSTALL/usr/bin +#cp $PKG_BUILD/tools/.libs/hal-setup-keymap $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/libhal/.libs/libhal.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/libhal-storage/.libs/libhal-storage.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libhal/.libs/libhal.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/libhal-storage/.libs/libhal-storage.so* $INSTALL/usr/lib mkdir -p $INSTALL/etc/hal/fdi/preprobe mkdir -p $INSTALL/etc/hal/fdi/information mkdir -p $INSTALL/etc/hal/fdi/policy mkdir -p $INSTALL/etc/udev/rules.d -cp $BUILD/$1*/tools/linux/90-hal.rules $INSTALL/etc/udev/rules.d +cp $PKG_BUILD/tools/linux/90-hal.rules $INSTALL/etc/udev/rules.d mkdir -p $INSTALL/etc/dbus-1/system.d -cp $BUILD/$1*/hal.conf $INSTALL/etc/dbus-1/system.d +cp $PKG_BUILD/hal.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/usr/share/hal/fdi/preprobe mkdir -p $INSTALL/usr/share/hal/fdi/information/10freedesktop mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor -#cp $BUILD/$1*/fdi/information/10freedesktop/*.fdi \ +#cp $PKG_BUILD/fdi/information/10freedesktop/*.fdi \ # $INSTALL/usr/share/hal/fdi/information/10freedesktop -#cp $BUILD/$1*/fdi/policy/10osvendor/*.fdi \ +#cp $PKG_BUILD/fdi/policy/10osvendor/*.fdi \ # $INSTALL/usr/share/hal/fdi/policy/10osvendor cp \ -$BUILD/$1*/fdi/policy/10osvendor/10-input-policy.fdi \ -$BUILD/$1*/fdi/policy/10osvendor/10-keymap.fdi \ -$BUILD/$1*/fdi/policy/10osvendor/10-usbcsr-mice.fdi \ -$BUILD/$1*/fdi/policy/10osvendor/20-acl-management.fdi \ -$BUILD/$1*/fdi/policy/10osvendor/20-storage-methods.fdi \ +$PKG_BUILD/fdi/policy/10osvendor/10-input-policy.fdi \ +$PKG_BUILD/fdi/policy/10osvendor/10-keymap.fdi \ +$PKG_BUILD/fdi/policy/10osvendor/10-usbcsr-mice.fdi \ +$PKG_BUILD/fdi/policy/10osvendor/20-acl-management.fdi \ +$PKG_BUILD/fdi/policy/10osvendor/20-storage-methods.fdi \ $INSTALL/usr/share/hal/fdi/policy/10osvendor diff --git a/packages/sysutils/pciutils/build b/packages/sysutils/pciutils/build index 9d11dbe9b6..a0afe4deca 100755 --- a/packages/sysutils/pciutils/build +++ b/packages/sysutils/pciutils/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain PKG_DIR=`find $PACKAGES -type d -name $1` -cd $BUILD/$1* +cd $PKG_BUILD make OPT="$TARGET_CFLAGS" \ CROSS_COMPILE=${TARGET_PREFIX} \ diff --git a/packages/sysutils/pciutils/install b/packages/sysutils/pciutils/install index d412b13112..6529b10196 100755 --- a/packages/sysutils/pciutils/install +++ b/packages/sysutils/pciutils/install @@ -3,7 +3,7 @@ . config/options mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/lspci $INSTALL/usr/bin +cp $PKG_BUILD/lspci $INSTALL/usr/bin mkdir -p $INSTALL/usr/share -cp $BUILD/$1*/pci.ids $INSTALL/usr/share \ No newline at end of file +cp $PKG_BUILD/pci.ids $INSTALL/usr/share \ No newline at end of file diff --git a/packages/sysutils/syslinux/build b/packages/sysutils/syslinux/build index 6981574378..34032aa30d 100755 --- a/packages/sysutils/syslinux/build +++ b/packages/sysutils/syslinux/build @@ -4,13 +4,13 @@ $SCRIPTS/build toolchain -CFLAGS="$CFLAGS -I`ls -d $ROOT/$BUILD/$1*`/libinstaller" -CFLAGS="$CFLAGS -I`ls -d $ROOT/$BUILD/$1*`/libfat" +CFLAGS="$CFLAGS -I`ls -d $ROOT/$PKG_BUILD`/libinstaller" +CFLAGS="$CFLAGS -I`ls -d $ROOT/$PKG_BUILD`/libfat" SUBDIRS="codepage core libinstaller mtools extlinux" #[ $TARGET_ARCH = i386 ] && SUBDIRS="$SUBDIRS mbr" -make -C $BUILD/$1* \ +make -C $PKG_BUILD \ CC=$CC \ AR=$AR \ RANLIB=$RANLIB \ @@ -18,4 +18,4 @@ make -C $BUILD/$1* \ LDFLAGS="$LDFLAGS" \ BSUBDIRS="$SUBDIRS" -#make -C $BUILD/$1*/com32 CC=$CC +#make -C $PKG_BUILD/com32 CC=$CC diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build index 5e212fb645..cec2911a0e 100755 --- a/packages/sysutils/udev/build +++ b/packages/sysutils/udev/build @@ -9,7 +9,7 @@ $SCRIPTS/build toolchain # EXTRAS="$EXTRAS extras/$i" #done -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/sysutils/udev/install b/packages/sysutils/udev/install index c2242402e8..0e6162e28f 100755 --- a/packages/sysutils/udev/install +++ b/packages/sysutils/udev/install @@ -5,30 +5,30 @@ PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/sbin -cp $BUILD/$1*/$1/udevadm $INSTALL/sbin +cp $PKG_BUILD/$1/udevadm $INSTALL/sbin mkdir -p $INSTALL/usr/bin ln -sf /sbin/udevadm $INSTALL/usr/bin/udevinfo mkdir -p $INSTALL/usr/sbin -cp $BUILD/$1*/$1/udevd $INSTALL/usr/sbin -#cp $BUILD/$1*/extras/firmware_helper/firmware_helper $INSTALL/sbin +cp $PKG_BUILD/$1/udevd $INSTALL/usr/sbin +#cp $PKG_BUILD/extras/firmware_helper/firmware_helper $INSTALL/sbin mkdir -p $INSTALL/usr/lib/udev for i in ata_id cdrom_id edd_id path_id scsi_id usb_id; do - cp $BUILD/$1*/extras/$i/$i $INSTALL/usr/lib/udev + cp $PKG_BUILD/extras/$i/$i $INSTALL/usr/lib/udev done -cp $BUILD/$1*/extras/volume_id/vol_id $INSTALL/usr/lib/udev +cp $PKG_BUILD/extras/volume_id/vol_id $INSTALL/usr/lib/udev #mkdir -p $INSTALL/usr/lib/udev #for i in ata_id cdrom_id dvb_device_name edd_id ide_media path_id scsi_id usb_device_name usb_id; do -# cp $BUILD/$1*/extras/$i/$i $INSTALL/usr/lib/udev +# cp $PKG_BUILD/extras/$i/$i $INSTALL/usr/lib/udev #done -#cp $BUILD/$1*/extras/volume_id/vol_id $INSTALL/usr/lib/udev +#cp $PKG_BUILD/extras/volume_id/vol_id $INSTALL/usr/lib/udev mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/extras/volume_id/lib/.libs/libvolume_id.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/udev/lib/.libs/libudev.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/extras/volume_id/lib/.libs/libvolume_id.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/udev/lib/.libs/libudev.so* $INSTALL/usr/lib mkdir -p $INSTALL/etc/udev/rules.d cp $PKG_DIR/config/udev.conf $INSTALL/etc/udev diff --git a/packages/sysutils/util-linux-ng/build b/packages/sysutils/util-linux-ng/build index 14c6a814ca..1f5715d147 100755 --- a/packages/sysutils/util-linux-ng/build +++ b/packages/sysutils/util-linux-ng/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/textproc/expat/build b/packages/textproc/expat/build index c3a5c15e42..6ef942d489 100755 --- a/packages/textproc/expat/build +++ b/packages/textproc/expat/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/textproc/expat/install b/packages/textproc/expat/install index f8efeea21b..3853fa68b3 100755 --- a/packages/textproc/expat/install +++ b/packages/textproc/expat/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/libexpat.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/.libs/libexpat.so* $INSTALL/usr/lib diff --git a/packages/textproc/libxml2/build b/packages/textproc/libxml2/build index 3d069ec38c..e5e10f6fba 100755 --- a/packages/textproc/libxml2/build +++ b/packages/textproc/libxml2/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libiconv -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/textproc/libxml2/install b/packages/textproc/libxml2/install index 0c32a15f9e..7fce790f6a 100755 --- a/packages/textproc/libxml2/install +++ b/packages/textproc/libxml2/install @@ -5,4 +5,4 @@ $SCRIPTS/install libiconv mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/libxml2*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/.libs/libxml2*.so* $INSTALL/usr/lib diff --git a/packages/toolchain/archivers/lzma/build b/packages/toolchain/archivers/lzma/build index e667b14cc1..fcb299dded 100755 --- a/packages/toolchain/archivers/lzma/build +++ b/packages/toolchain/archivers/lzma/build @@ -6,5 +6,5 @@ $SCRIPTS/install ccache setup_toolchain host -LZDIR=$BUILD/$1*/CPP/7zip/Compress/LZMA_Alone +LZDIR=$PKG_BUILD/CPP/7zip/Compress/LZMA_Alone make -C $LZDIR -f makefile.gcc CXX="$CXX $CFLAGS" CXX_C="$CC $CFLAGS" diff --git a/packages/toolchain/archivers/lzma/install b/packages/toolchain/archivers/lzma/install index 382507d074..07cc33880a 100755 --- a/packages/toolchain/archivers/lzma/install +++ b/packages/toolchain/archivers/lzma/install @@ -3,4 +3,4 @@ . config/options mkdir -p $ROOT/$TOOLCHAIN/bin -cp -rf $BUILD/$1*/CPP/7zip/Compress/LZMA_Alone/lzma $ROOT/$TOOLCHAIN/bin +cp -rf $PKG_BUILD/CPP/7zip/Compress/LZMA_Alone/lzma $ROOT/$TOOLCHAIN/bin diff --git a/packages/toolchain/devel/binutils/build b/packages/toolchain/devel/binutils/build index b05a3197c9..d0a4299e72 100755 --- a/packages/toolchain/devel/binutils/build +++ b/packages/toolchain/devel/binutils/build @@ -6,7 +6,7 @@ $SCRIPTS/install ccache setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p objdir cd objdir ../configure --host=$HOST_NAME \ diff --git a/packages/toolchain/devel/binutils/install b/packages/toolchain/devel/binutils/install index e2bfe73b2b..ac1ccf8814 100755 --- a/packages/toolchain/devel/binutils/install +++ b/packages/toolchain/devel/binutils/install @@ -4,10 +4,10 @@ PKG_DIR=`find $PACKAGES -type d -name $1` -make -C $BUILD/$1*/objdir install +make -C $PKG_BUILD/objdir install mkdir -p $SYSROOT_PREFIX/usr/include -cp -v $BUILD/$1*/include/libiberty.h $SYSROOT_PREFIX/usr/include +cp -v $PKG_BUILD/include/libiberty.h $SYSROOT_PREFIX/usr/include mkdir -p $TOOLCHAIN/bin cp $PKG_DIR/scripts/libstrip $TOOLCHAIN/bin diff --git a/packages/toolchain/devel/ccache/build b/packages/toolchain/devel/ccache/build index bc9a2ef479..e57b9159a3 100755 --- a/packages/toolchain/devel/ccache/build +++ b/packages/toolchain/devel/ccache/build @@ -7,7 +7,7 @@ $SCRIPTS/install make setup_toolchain host CC=$LOCAL_CC -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$HOST_NAME \ --build=$HOST_NAME \ --prefix=$ROOT/$TOOLCHAIN diff --git a/packages/toolchain/devel/ccache/install b/packages/toolchain/devel/ccache/install index a2e6272077..238e78cf2c 100755 --- a/packages/toolchain/devel/ccache/install +++ b/packages/toolchain/devel/ccache/install @@ -4,7 +4,7 @@ GCC_PKG_DIR=`find $PACKAGES -type d -name gcc` -make -C $BUILD/$1* install +make -C $PKG_BUILD install if [ "$2" = toolchain ]; then GCC_VERSION=`sed -n 's/.*\/gcc-\([0-9\.]*\)\..*/\1/p' $GCC_PKG_DIR/url` diff --git a/packages/toolchain/devel/cmake/build b/packages/toolchain/devel/cmake/build index ea854cda2b..1d2996848f 100755 --- a/packages/toolchain/devel/cmake/build +++ b/packages/toolchain/devel/cmake/build @@ -7,7 +7,7 @@ export CXX=$HOST_CXX export CFLAGS="$HOST_CFLAGS" export CXXFLAGS="$HOST_CXXFLAGS" -cd $BUILD/$1* +cd $PKG_BUILD ./configure --no-qt-gui diff --git a/packages/toolchain/devel/cmake/install b/packages/toolchain/devel/cmake/install index f2134f3226..88c1e729e2 100755 --- a/packages/toolchain/devel/cmake/install +++ b/packages/toolchain/devel/cmake/install @@ -2,8 +2,8 @@ . config/options -cp $BUILD/$1*/bin/cmake \ - $BUILD/$1*/bin/ccmake \ - $BUILD/$1*/bin/cpack \ - $BUILD/$1*/bin/ctest \ +cp $PKG_BUILD/bin/cmake \ + $PKG_BUILD/bin/ccmake \ + $PKG_BUILD/bin/cpack \ + $PKG_BUILD/bin/ctest \ $ROOT/$TOOLCHAIN/bin diff --git a/packages/toolchain/devel/jam/build b/packages/toolchain/devel/jam/build index ee5341ff6b..b9b71f0b62 100755 --- a/packages/toolchain/devel/jam/build +++ b/packages/toolchain/devel/jam/build @@ -8,7 +8,7 @@ #export CXXFLAGS="$HOST_CXXFLAGS" #setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD make CC=$HOST_CC CFLAGS="$HOST_CFLAGS" AR="$HOST_AR" RANLIB="$HOST_RANLIB" diff --git a/packages/toolchain/devel/make/build b/packages/toolchain/devel/make/build index 3f8d366c17..1f90332801 100755 --- a/packages/toolchain/devel/make/build +++ b/packages/toolchain/devel/make/build @@ -5,7 +5,7 @@ setup_toolchain host CC=$LOCAL_CC -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$HOST_NAME \ --build=$HOST_NAME \ --disable-nls diff --git a/packages/toolchain/devel/make/install b/packages/toolchain/devel/make/install index ea6fccef9a..f19f19a994 100755 --- a/packages/toolchain/devel/make/install +++ b/packages/toolchain/devel/make/install @@ -3,4 +3,4 @@ . config/options mkdir -p $ROOT/$TOOLCHAIN/bin -cp $BUILD/$1*/$1 $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 5c167dba32..dcce4fa4fc 100755 --- a/packages/toolchain/devel/make/unpack +++ b/packages/toolchain/devel/make/unpack @@ -2,4 +2,4 @@ . config/options -$SCRIPTS/fixconfigtools $BUILD/$1*/config +$SCRIPTS/fixconfigtools $PKG_BUILD/config diff --git a/packages/toolchain/devel/pkg-config/build b/packages/toolchain/devel/pkg-config/build index ca3b103277..4f78b061f9 100755 --- a/packages/toolchain/devel/pkg-config/build +++ b/packages/toolchain/devel/pkg-config/build @@ -4,7 +4,7 @@ setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-pc-path="$SYSROOT_PREFIX/usr/lib/pkgconfig" \ diff --git a/packages/toolchain/devel/pkg-config/install b/packages/toolchain/devel/pkg-config/install index ea6fccef9a..f19f19a994 100755 --- a/packages/toolchain/devel/pkg-config/install +++ b/packages/toolchain/devel/pkg-config/install @@ -3,4 +3,4 @@ . config/options mkdir -p $ROOT/$TOOLCHAIN/bin -cp $BUILD/$1*/$1 $ROOT/$TOOLCHAIN/bin +cp $PKG_BUILD/$1 $ROOT/$TOOLCHAIN/bin diff --git a/packages/toolchain/devel/uClibc/build b/packages/toolchain/devel/uClibc/build index 19e2d97377..f9b4cb50a2 100755 --- a/packages/toolchain/devel/uClibc/build +++ b/packages/toolchain/devel/uClibc/build @@ -5,7 +5,7 @@ $SCRIPTS/install gcc-core toolchain [ "$DEBUG" = yes ] && CFLAGS="$CFLAGS -D_DLSYM_TRACE_NAME" -make -C $BUILD/$1* -#[ "$DEVTOOLS" = yes ] && make -C $BUILD/$1*/utils -make -C $BUILD/$1*/utils +make -C $PKG_BUILD +#[ "$DEVTOOLS" = yes ] && make -C $PKG_BUILD/utils +make -C $PKG_BUILD/utils exit 0 diff --git a/packages/toolchain/devel/uClibc/install b/packages/toolchain/devel/uClibc/install index a78fede954..0210d7ee15 100755 --- a/packages/toolchain/devel/uClibc/install +++ b/packages/toolchain/devel/uClibc/install @@ -5,29 +5,29 @@ if [ "$2" = toolchain ]; then rm -rf "$SYSROOT_PREFIX/lib" "$SYSROOT_PREFIX/usr/lib" "$SYSROOT_PREFIX/usr/include" $SCRIPTS/install linux-headers - make -C $BUILD/$1* PREFIX="$SYSROOT_PREFIX" install + make -C $PKG_BUILD PREFIX="$SYSROOT_PREFIX" install exit 0 fi mkdir -p $INSTALL/lib - cp $BUILD/$1*/lib/ld*-uClibc.so.0 $INSTALL/lib - cp $BUILD/$1*/lib/libc.so.0 $INSTALL/lib - cp $BUILD/$1*/lib/libdl.so.0 $INSTALL/lib - cp $BUILD/$1*/lib/libpthread.so.0 $INSTALL/lib - cp $BUILD/$1*/lib/libm.so.0 $INSTALL/lib - cp $BUILD/$1*/lib/libutil.so.0 $INSTALL/lib - cp $BUILD/$1*/lib/librt.so.0 $INSTALL/lib + cp $PKG_BUILD/lib/ld*-uClibc.so.0 $INSTALL/lib + cp $PKG_BUILD/lib/libc.so.0 $INSTALL/lib + cp $PKG_BUILD/lib/libdl.so.0 $INSTALL/lib + cp $PKG_BUILD/lib/libpthread.so.0 $INSTALL/lib + cp $PKG_BUILD/lib/libm.so.0 $INSTALL/lib + cp $PKG_BUILD/lib/libutil.so.0 $INSTALL/lib + cp $PKG_BUILD/lib/librt.so.0 $INSTALL/lib # needed by dbus-glib - cp $BUILD/$1*/lib/libnsl.so.0 $INSTALL/lib + cp $PKG_BUILD/lib/libnsl.so.0 $INSTALL/lib - [ "$DEBUG" = yes ] && cp $BUILD/$1*/lib/libthread_db.so.1 $INSTALL/lib - [ "$NETWORK" = yes ] && cp $BUILD/$1*/lib/libcrypt.so.0 $INSTALL/lib - [ "$NETWORK" = yes ] && cp $BUILD/$1*/lib/libresolv.so.0 $INSTALL/lib + [ "$DEBUG" = yes ] && cp $PKG_BUILD/lib/libthread_db.so.1 $INSTALL/lib + [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libcrypt.so.0 $INSTALL/lib + [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libresolv.so.0 $INSTALL/lib [ "$DEVTOOLS" = yes ] && \ mkdir -p $INSTALL/bin && \ - cp $BUILD/$1*/utils/ldd $INSTALL/bin + cp $PKG_BUILD/utils/ldd $INSTALL/bin [ -n "$TIMEZONE" ] && mkdir -p $INSTALL/etc && echo -n "$TIMEZONE" > $INSTALL/etc/TZ diff --git a/packages/toolchain/devel/uClibc/unpack b/packages/toolchain/devel/uClibc/unpack index 1226d29b13..b0cb2ab53f 100755 --- a/packages/toolchain/devel/uClibc/unpack +++ b/packages/toolchain/devel/uClibc/unpack @@ -4,7 +4,7 @@ $SCRIPTS/unpack linux -UCLIBC=`ls -d $BUILD/$1*` +UCLIBC=`ls -d $PKG_BUILD` PKG_DIR=`find $PACKAGES -type d -name $1` sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \ diff --git a/packages/toolchain/lang/gcc/unpack b/packages/toolchain/lang/gcc/unpack index 8ec0597eed..b41aa9cd53 100755 --- a/packages/toolchain/lang/gcc/unpack +++ b/packages/toolchain/lang/gcc/unpack @@ -2,4 +2,4 @@ . config/options -$SCRIPTS/fixconfigtools $BUILD/$1*/gcc +$SCRIPTS/fixconfigtools $PKG_BUILD/gcc diff --git a/packages/toolchain/math/gmp/build b/packages/toolchain/math/gmp/build index 7bc862a3c7..8f9541d06b 100755 --- a/packages/toolchain/math/gmp/build +++ b/packages/toolchain/math/gmp/build @@ -6,7 +6,7 @@ $SCRIPTS/install ccache setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p objdir cd objdir ../configure --prefix=$ROOT/$TOOLCHAIN \ diff --git a/packages/toolchain/math/gmp/install b/packages/toolchain/math/gmp/install index 643c8512c6..0dc98a47bf 100755 --- a/packages/toolchain/math/gmp/install +++ b/packages/toolchain/math/gmp/install @@ -2,4 +2,4 @@ . config/options -make -C $BUILD/$1*/objdir install +make -C $PKG_BUILD/objdir install diff --git a/packages/toolchain/math/mpfr/build b/packages/toolchain/math/mpfr/build index 9851f68f31..7933b9191d 100755 --- a/packages/toolchain/math/mpfr/build +++ b/packages/toolchain/math/mpfr/build @@ -7,7 +7,7 @@ $SCRIPTS/install gmp setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD mkdir -p objdir cd objdir LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib" \ diff --git a/packages/toolchain/math/mpfr/install b/packages/toolchain/math/mpfr/install index 643c8512c6..0dc98a47bf 100755 --- a/packages/toolchain/math/mpfr/install +++ b/packages/toolchain/math/mpfr/install @@ -2,4 +2,4 @@ . config/options -make -C $BUILD/$1*/objdir install +make -C $PKG_BUILD/objdir install diff --git a/packages/toolchain/other/swig/build b/packages/toolchain/other/swig/build index 936a43fb57..968e2559ff 100755 --- a/packages/toolchain/other/swig/build +++ b/packages/toolchain/other/swig/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD ./configure --prefix=$ROOT/$TOOLCHAIN \ make diff --git a/packages/toolchain/sed/build b/packages/toolchain/sed/build index 7162b5789b..cf1c0e387b 100755 --- a/packages/toolchain/sed/build +++ b/packages/toolchain/sed/build @@ -6,7 +6,7 @@ $SCRIPTS/install ccache setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$HOST_NAME \ --build=$HOST_NAME \ --prefix=$ROOT/$TOOLCHAIN \ diff --git a/packages/toolchain/sed/install b/packages/toolchain/sed/install index 9157558b68..c2f5386dda 100755 --- a/packages/toolchain/sed/install +++ b/packages/toolchain/sed/install @@ -2,4 +2,4 @@ . config/options -make -C $BUILD/$1*/$1 install +make -C $PKG_BUILD/$1 install diff --git a/packages/toolchain/sed/unpack b/packages/toolchain/sed/unpack index 5c167dba32..dcce4fa4fc 100755 --- a/packages/toolchain/sed/unpack +++ b/packages/toolchain/sed/unpack @@ -2,4 +2,4 @@ . config/options -$SCRIPTS/fixconfigtools $BUILD/$1*/config +$SCRIPTS/fixconfigtools $PKG_BUILD/config diff --git a/packages/toolchain/sysutils/mkfs.axfs/build b/packages/toolchain/sysutils/mkfs.axfs/build index d56402d7fc..bb5ac82972 100755 --- a/packages/toolchain/sysutils/mkfs.axfs/build +++ b/packages/toolchain/sysutils/mkfs.axfs/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD make diff --git a/packages/tools/coreboot-v2/build b/packages/tools/coreboot-v2/build index 34b6f0d33b..f4ae3cd546 100755 --- a/packages/tools/coreboot-v2/build +++ b/packages/tools/coreboot-v2/build @@ -6,6 +6,6 @@ $SCRIPTS/build toolchain $SCRIPTS/build zlib $SCRIPTS/build pciutils -cd $BUILD/$1* +cd $PKG_BUILD $MAKE CC=$TARGET_CC STRIP=$STRIP diff --git a/packages/tools/coreboot-v2/install b/packages/tools/coreboot-v2/install index 9a486c6819..40825e2f62 100755 --- a/packages/tools/coreboot-v2/install +++ b/packages/tools/coreboot-v2/install @@ -6,4 +6,4 @@ $SCRIPTS/install zlib $SCRIPTS/install pciutils mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/$1 $INSTALL/usr/bin +cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/tools/flashrom/build b/packages/tools/flashrom/build index 34b6f0d33b..f4ae3cd546 100755 --- a/packages/tools/flashrom/build +++ b/packages/tools/flashrom/build @@ -6,6 +6,6 @@ $SCRIPTS/build toolchain $SCRIPTS/build zlib $SCRIPTS/build pciutils -cd $BUILD/$1* +cd $PKG_BUILD $MAKE CC=$TARGET_CC STRIP=$STRIP diff --git a/packages/tools/flashrom/install b/packages/tools/flashrom/install index 9a486c6819..40825e2f62 100755 --- a/packages/tools/flashrom/install +++ b/packages/tools/flashrom/install @@ -6,4 +6,4 @@ $SCRIPTS/install zlib $SCRIPTS/install pciutils mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/$1 $INSTALL/usr/bin +cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/tools/getpir/build b/packages/tools/getpir/build index ed81c119db..9e0c077bbe 100755 --- a/packages/tools/getpir/build +++ b/packages/tools/getpir/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build pciutils -cd $BUILD/$1* +cd $PKG_BUILD $MAKE CC=$TARGET_CC getpir $MAKE CC=$TARGET_CC checkpir diff --git a/packages/tools/getpir/install b/packages/tools/getpir/install index 658c46acde..c5b06b198c 100755 --- a/packages/tools/getpir/install +++ b/packages/tools/getpir/install @@ -5,5 +5,5 @@ $SCRIPTS/install pciutils mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/$1 $INSTALL/usr/bin -cp -PR $BUILD/$1*/checkpir $INSTALL/usr/bin +cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin +cp -PR $PKG_BUILD/checkpir $INSTALL/usr/bin diff --git a/packages/tools/superiotool/build b/packages/tools/superiotool/build index 1f44539a59..862e9dba62 100755 --- a/packages/tools/superiotool/build +++ b/packages/tools/superiotool/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD $MAKE CC=$TARGET_CC diff --git a/packages/tools/superiotool/install b/packages/tools/superiotool/install index ade27c09db..916f28304e 100755 --- a/packages/tools/superiotool/install +++ b/packages/tools/superiotool/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/$1 $INSTALL/usr/bin +cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/x11-fonts/fontconfig/build b/packages/x11-fonts/fontconfig/build index f102f59b23..4211b405a0 100755 --- a/packages/x11-fonts/fontconfig/build +++ b/packages/x11-fonts/fontconfig/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build freetype $SCRIPTS/build zlib -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11-fonts/fontconfig/install b/packages/x11-fonts/fontconfig/install index 48fdec5759..253c61ae7e 100755 --- a/packages/x11-fonts/fontconfig/install +++ b/packages/x11-fonts/fontconfig/install @@ -6,8 +6,8 @@ $SCRIPTS/install zlib $SCRIPTS/install freetype mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libfontconfig.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libfontconfig.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/fc-cache/.libs/fc-cache $INSTALL/usr/bin +cp -PR $PKG_BUILD/fc-cache/.libs/fc-cache $INSTALL/usr/bin mkdir -p $INSTALL/etc/fonts cp -R $SYSROOT_PREFIX/etc/fonts/* $INSTALL/etc/fonts diff --git a/packages/x11-fonts/liberation-fonts/install b/packages/x11-fonts/liberation-fonts/install index 6a4bb7a0ac..1ee1fdce53 100755 --- a/packages/x11-fonts/liberation-fonts/install +++ b/packages/x11-fonts/liberation-fonts/install @@ -3,7 +3,7 @@ . config/options mkdir -p $INSTALL/usr/share/fonts/liberation -cp $BUILD/$1*/*.ttf $INSTALL/usr/share/fonts/liberation +cp $PKG_BUILD/*.ttf $INSTALL/usr/share/fonts/liberation mkfontdir $INSTALL/usr/share/fonts/liberation mkfontscale $INSTALL/usr/share/fonts/liberation @@ -11,7 +11,7 @@ mkdir -p $INSTALL/$XORG_PATH_FONTS/ ln -sf /usr/share/fonts/liberation $INSTALL/$XORG_PATH_FONTS/ #mkdir -p $INSTALL/$XORG_PATH_FONTS/TTF/ -#cp $BUILD/$1*/*.ttf $INSTALL/$XORG_PATH_FONTS/TTF/ +#cp $PKG_BUILD/*.ttf $INSTALL/$XORG_PATH_FONTS/TTF/ #mkfontdir $INSTALL/$XORG_PATH_FONTS/TTF/ #mkfontscale $INSTALL/$XORG_PATH_FONTS/TTF/ diff --git a/packages/x11-toolkits/gtk+/build b/packages/x11-toolkits/gtk+/build index 137dd819a0..f5be380f1c 100755 --- a/packages/x11-toolkits/gtk+/build +++ b/packages/x11-toolkits/gtk+/build @@ -16,7 +16,7 @@ $SCRIPTS/build glib $SCRIPTS/build pango $SCRIPTS/build cairo -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ diff --git a/packages/x11-toolkits/gtk+/install b/packages/x11-toolkits/gtk+/install index 909ad4a579..4bb7473f5f 100755 --- a/packages/x11-toolkits/gtk+/install +++ b/packages/x11-toolkits/gtk+/install @@ -17,32 +17,32 @@ GTK_LIB_DIR="gtk-2.0/$GTK_BINARY_VERSION" PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib*.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/gdk-pixbuf/.libs/libgdk_pixbuf*.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/gdk/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/gdk-pixbuf/.libs/libgdk_pixbuf*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/gdk/.libs/*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libgdk*.so*T -cp -PR $BUILD/$1*/gtk/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/gtk/.libs/*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libgtk*.so*T mkdir -p $INSTALL/usr/lib/$GTK_LIB_DIR/engines -cp -PR $BUILD/$1*/modules/engines/pixbuf/.libs/*.so \ +cp -PR $PKG_BUILD/modules/engines/pixbuf/.libs/*.so \ $INSTALL/usr/lib/$GTK_LIB_DIR/engines mkdir -p $INSTALL/usr/lib/$GTK_LIB_DIR/immodules -cp -PR $BUILD/$1*/modules/input/.libs/*.so \ +cp -PR $PKG_BUILD/modules/input/.libs/*.so \ $INSTALL/usr/lib/$GTK_LIB_DIR/immodules mkdir -p $INSTALL/usr/lib/$GTK_LIB_DIR/printbackends -cp -PR $BUILD/$1*/modules/printbackends/*/.libs/*.so \ +cp -PR $PKG_BUILD/modules/printbackends/*/.libs/*.so \ $INSTALL/usr/lib/$GTK_LIB_DIR/printbackends mkdir -p $INSTALL/usr/lib/$GTK_LIB_DIR/loaders -cp -PR $BUILD/$1*/gdk-pixbuf/.libs/libpixbufloader*.so \ +cp -PR $PKG_BUILD/gdk-pixbuf/.libs/libpixbufloader*.so \ $INSTALL/usr/lib/$GTK_LIB_DIR/loaders mkdir -p $INSTALL/etc/gtk-2.0 -cp -PR $BUILD/$1*/modules/input/im-multipress.conf \ +cp -PR $PKG_BUILD/modules/input/im-multipress.conf \ $INSTALL/etc/gtk-2.0 #cp -PR $PKG_DIR/config/gdk-pixbuf.loaders \ # $INSTALL/etc/gtk-2.0 mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/gtk/.libs/gtk-query-immodules-2.0 $INSTALL/usr/bin -cp -PR $BUILD/$1*/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders $INSTALL/usr/bin \ No newline at end of file +cp -PR $PKG_BUILD/gtk/.libs/gtk-query-immodules-2.0 $INSTALL/usr/bin +cp -PR $PKG_BUILD/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders $INSTALL/usr/bin \ No newline at end of file diff --git a/packages/x11-toolkits/libglade/build b/packages/x11-toolkits/libglade/build index cfd558c5d1..48bdae15a4 100755 --- a/packages/x11-toolkits/libglade/build +++ b/packages/x11-toolkits/libglade/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build Python $SCRIPTS/build gtk+ -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11-toolkits/libglade/install b/packages/x11-toolkits/libglade/install index 77c5a68be7..ece5123d6c 100755 --- a/packages/x11-toolkits/libglade/install +++ b/packages/x11-toolkits/libglade/install @@ -6,7 +6,7 @@ $SCRIPTS/install Python $SCRIPTS/install gtk+ mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/glade/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/glade/.libs/*.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/share/xml/$1 -cp -PR $BUILD/$1*/*.dtd $INSTALL/usr/share/xml/$1 +cp -PR $PKG_BUILD/*.dtd $INSTALL/usr/share/xml/$1 diff --git a/packages/x11-toolkits/pango/build b/packages/x11-toolkits/pango/build index 8e85f36192..73e30a61b0 100755 --- a/packages/x11-toolkits/pango/build +++ b/packages/x11-toolkits/pango/build @@ -10,7 +10,7 @@ $SCRIPTS/build fontconfig $SCRIPTS/build libX11 $SCRIPTS/build libXft -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/x11-toolkits/pango/install b/packages/x11-toolkits/pango/install index 32bba23ac7..100501417c 100755 --- a/packages/x11-toolkits/pango/install +++ b/packages/x11-toolkits/pango/install @@ -11,15 +11,15 @@ $SCRIPTS/install libXft MODULE_VERSION=`pkg-config pango --variable=pango_module_version` mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/pango/.libs/libpango*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/pango/.libs/libpango*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libpango*.so*T mkdir -p $INSTALL/usr/lib/pango/$MODULE_VERSION/modules -cp -PR $BUILD/$1*/modules/*/.libs/*.so \ +cp -PR $PKG_BUILD/modules/*/.libs/*.so \ $INSTALL/usr/lib/pango/$MODULE_VERSION/modules mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/pango/.libs/pango-querymodules $INSTALL/usr/bin +cp -PR $PKG_BUILD/pango/.libs/pango-querymodules $INSTALL/usr/bin mkdir -p $INSTALL/etc/pango -cp -PR $BUILD/$1*/$1/pangox.aliases $INSTALL/etc/pango +cp -PR $PKG_BUILD/$1/pangox.aliases $INSTALL/etc/pango diff --git a/packages/x11/app/setxkbmap/build b/packages/x11/app/setxkbmap/build index e3651dff5e..bfa8341c61 100755 --- a/packages/x11/app/setxkbmap/build +++ b/packages/x11/app/setxkbmap/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/app/setxkbmap/install b/packages/x11/app/setxkbmap/install index 5da0600df4..adeb10212a 100755 --- a/packages/x11/app/setxkbmap/install +++ b/packages/x11/app/setxkbmap/install @@ -4,5 +4,5 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/$1 $INSTALL/usr/bin +cp $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/x11/app/xdriinfo/build b/packages/x11/app/xdriinfo/build index 782733c462..176c6d05f5 100755 --- a/packages/x11/app/xdriinfo/build +++ b/packages/x11/app/xdriinfo/build @@ -7,7 +7,7 @@ $SCRIPTS/build libX11 $SCRIPTS/build $LIBDRM $SCRIPTS/build $MESA -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/app/xdriinfo/install b/packages/x11/app/xdriinfo/install index 9c1ba9747c..898a90c573 100755 --- a/packages/x11/app/xdriinfo/install +++ b/packages/x11/app/xdriinfo/install @@ -6,5 +6,5 @@ $SCRIPTS/install $MESA $SCRIPTS/install $LIBDRM mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/$1 $INSTALL/usr/bin +cp $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/x11/app/xinit/build b/packages/x11/app/xinit/build index ae7023ecc1..1cf2c88259 100755 --- a/packages/x11/app/xinit/build +++ b/packages/x11/app/xinit/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/app/xinit/install b/packages/x11/app/xinit/install index da4a5a7a4b..3581ea570d 100755 --- a/packages/x11/app/xinit/install +++ b/packages/x11/app/xinit/install @@ -5,8 +5,8 @@ PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/$1 $INSTALL/usr/bin -cp -PR $BUILD/$1*/startx $INSTALL/usr/bin +cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin +cp -PR $PKG_BUILD/startx $INSTALL/usr/bin chmod +x $INSTALL/usr/bin/startx mkdir -p $INSTALL/usr/lib/X11/xinit/ diff --git a/packages/x11/app/xkbcomp/build b/packages/x11/app/xkbcomp/build index e3651dff5e..bfa8341c61 100755 --- a/packages/x11/app/xkbcomp/build +++ b/packages/x11/app/xkbcomp/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/app/xkbcomp/install b/packages/x11/app/xkbcomp/install index 5da0600df4..adeb10212a 100755 --- a/packages/x11/app/xkbcomp/install +++ b/packages/x11/app/xkbcomp/install @@ -4,5 +4,5 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/$1 $INSTALL/usr/bin +cp $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/x11/app/xrandr/build b/packages/x11/app/xrandr/build index 0896af319f..4c32ae670c 100755 --- a/packages/x11/app/xrandr/build +++ b/packages/x11/app/xrandr/build @@ -7,7 +7,7 @@ $SCRIPTS/build libXrandr export CFLAGS="$CFLAGS -O2" -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/app/xrandr/install b/packages/x11/app/xrandr/install index fc6e56da64..8596bd8825 100755 --- a/packages/x11/app/xrandr/install +++ b/packages/x11/app/xrandr/install @@ -4,4 +4,4 @@ $SCRIPTS/install libXrandr mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/$1 $INSTALL/usr/bin +cp $PKG_BUILD/$1 $INSTALL/usr/bin diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build index ed70b5e4b2..b8509341fe 100755 --- a/packages/x11/data/xkeyboard-config/build +++ b/packages/x11/data/xkeyboard-config/build @@ -5,9 +5,9 @@ $SCRIPTS/build toolchain $SCRIPTS/build xkbcomp -SRC_DIR=`ls -d $ROOT/$BUILD/$1*` +SRC_DIR=`ls -d $ROOT/$PKG_BUILD` -cd $BUILD/$1* +cd $PKG_BUILD XKBCOMP="/usr/bin/xkbcomp" \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/x11/data/xkeyboard-config/install b/packages/x11/data/xkeyboard-config/install index 3b4d3c3807..8555b2d4e1 100755 --- a/packages/x11/data/xkeyboard-config/install +++ b/packages/x11/data/xkeyboard-config/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_XKB -cp -PR $BUILD/$1*/.install/$XORG_PATH_XKB/* $INSTALL/$XORG_PATH_XKB +cp -PR $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 91ca2ead23..d877887e01 100755 --- a/packages/x11/driver/xf86-input-evdev/build +++ b/packages/x11/driver/xf86-input-evdev/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-input-evdev/install b/packages/x11/driver/xf86-input-evdev/install index fb7e8821dd..6fcf601feb 100755 --- a/packages/x11/driver/xf86-input-evdev/install +++ b/packages/x11/driver/xf86-input-evdev/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MODULES/input -cp $BUILD/$1*/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input +cp $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 faeb256c54..7b887b246d 100755 --- a/packages/x11/driver/xf86-input-synaptics/build +++ b/packages/x11/driver/xf86-input-synaptics/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libXi -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-input-synaptics/install b/packages/x11/driver/xf86-input-synaptics/install index 1be664f4ce..d7891dc30e 100755 --- a/packages/x11/driver/xf86-input-synaptics/install +++ b/packages/x11/driver/xf86-input-synaptics/install @@ -5,7 +5,7 @@ $SCRIPTS/install libXi mkdir -p $INSTALL/$XORG_PATH_MODULES/input -cp $BUILD/$1*/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input +cp $PKG_BUILD/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ -cp $BUILD/$1*/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ +cp $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ diff --git a/packages/x11/driver/xf86-video-ati/build b/packages/x11/driver/xf86-video-ati/build index cb2d24011d..bbcf5eddb8 100755 --- a/packages/x11/driver/xf86-video-ati/build +++ b/packages/x11/driver/xf86-video-ati/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-video-ati/install b/packages/x11/driver/xf86-video-ati/install index bca5d35f1b..8975f6729f 100755 --- a/packages/x11/driver/xf86-video-ati/install +++ b/packages/x11/driver/xf86-video-ati/install @@ -3,10 +3,10 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/.libs/ati_drv.so $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/.libs/radeon_drv.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/.libs/ati_drv.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/.libs/radeon_drv.so $INSTALL/$XORG_PATH_MODULES/drivers mkdir -p $INSTALL/$XORG_PATH_MODULES/multimedia -cp $BUILD/$1*/src/.libs/theatre_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia -cp $BUILD/$1*/src/.libs/theatre200_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia -cp $BUILD/$1*/src/.libs/theatre_detect_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia +cp $PKG_BUILD/src/.libs/theatre_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia +cp $PKG_BUILD/src/.libs/theatre200_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia +cp $PKG_BUILD/src/.libs/theatre_detect_drv.so $INSTALL/$XORG_PATH_MODULES/multimedia diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build index d1af4d6dc2..440b064a4c 100755 --- a/packages/x11/driver/xf86-video-intel/build +++ b/packages/x11/driver/xf86-video-intel/build @@ -4,9 +4,9 @@ $SCRIPTS/build toolchain -CFLAGS="$CFLAGS -I$BUILD/$1*/src/xvmc" +CFLAGS="$CFLAGS -I$PKG_BUILD/src/xvmc" -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-video-intel/install b/packages/x11/driver/xf86-video-intel/install index f0e4f048aa..eed68030ff 100755 --- a/packages/x11/driver/xf86-video-intel/install +++ b/packages/x11/driver/xf86-video-intel/install @@ -3,9 +3,9 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/.libs/intel_drv.so $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/ch7017/.libs/ch7017.so $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/ch7xxx/.libs/ch7xxx.so $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/ivch/.libs/ivch.so $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/sil164/.libs/sil164.so $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/tfp410/.libs/tfp410.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/.libs/intel_drv.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/ch7017/.libs/ch7017.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/ch7xxx/.libs/ch7xxx.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/ivch/.libs/ivch.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/sil164/.libs/sil164.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/tfp410/.libs/tfp410.so $INSTALL/$XORG_PATH_MODULES/drivers diff --git a/packages/x11/driver/xf86-video-nouveau/build b/packages/x11/driver/xf86-video-nouveau/build index 3b5440a9bf..aa198cdfb4 100755 --- a/packages/x11/driver/xf86-video-nouveau/build +++ b/packages/x11/driver/xf86-video-nouveau/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build $MESA $SCRIPTS/build $LIBDRM -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-video-nouveau/install b/packages/x11/driver/xf86-video-nouveau/install index ff1f178f9c..578527e9f6 100755 --- a/packages/x11/driver/xf86-video-nouveau/install +++ b/packages/x11/driver/xf86-video-nouveau/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers diff --git a/packages/x11/driver/xf86-video-nv/build b/packages/x11/driver/xf86-video-nv/build index 58dbad5aca..e22b353c90 100755 --- a/packages/x11/driver/xf86-video-nv/build +++ b/packages/x11/driver/xf86-video-nv/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-video-nv/install b/packages/x11/driver/xf86-video-nv/install index ff1f178f9c..578527e9f6 100755 --- a/packages/x11/driver/xf86-video-nv/install +++ b/packages/x11/driver/xf86-video-nv/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers diff --git a/packages/x11/driver/xf86-video-openchrome-ttm/build b/packages/x11/driver/xf86-video-openchrome-ttm/build index 26c3893fd0..e744b3d2cb 100755 --- a/packages/x11/driver/xf86-video-openchrome-ttm/build +++ b/packages/x11/driver/xf86-video-openchrome-ttm/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-video-openchrome-ttm/install b/packages/x11/driver/xf86-video-openchrome-ttm/install index 3a5fa54a66..232990dc80 100755 --- a/packages/x11/driver/xf86-video-openchrome-ttm/install +++ b/packages/x11/driver/xf86-video-openchrome-ttm/install @@ -5,10 +5,10 @@ PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers #mkdir -p $INSTALL/usr/lib -#cp $BUILD/$1*/libxvmc/.libs/*.so* $INSTALL/usr/lib +#cp $PKG_BUILD/libxvmc/.libs/*.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/share/hwdata/videoaliases cp $PKG_DIR/config/openchrome.xinf $INSTALL/usr/share/hwdata/videoaliases diff --git a/packages/x11/driver/xf86-video-openchrome/build b/packages/x11/driver/xf86-video-openchrome/build index 2ceccc9e4e..351e1263c9 100755 --- a/packages/x11/driver/xf86-video-openchrome/build +++ b/packages/x11/driver/xf86-video-openchrome/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-video-openchrome/install b/packages/x11/driver/xf86-video-openchrome/install index 0c4a6e1bd6..265f372f61 100755 --- a/packages/x11/driver/xf86-video-openchrome/install +++ b/packages/x11/driver/xf86-video-openchrome/install @@ -5,10 +5,10 @@ PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers mkdir -p $INSTALL/usr/lib -cp $BUILD/$1*/libxvmc/.libs/*.so* $INSTALL/usr/lib +cp $PKG_BUILD/libxvmc/.libs/*.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/share/hwdata/videoaliases cp $PKG_DIR/config/openchrome.xinf $INSTALL/usr/share/hwdata/videoaliases \ No newline at end of file diff --git a/packages/x11/driver/xf86-video-vesa/build b/packages/x11/driver/xf86-video-vesa/build index 58dbad5aca..e22b353c90 100755 --- a/packages/x11/driver/xf86-video-vesa/build +++ b/packages/x11/driver/xf86-video-vesa/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/driver/xf86-video-vesa/install b/packages/x11/driver/xf86-video-vesa/install index 4a3f1cfc26..8b7cc647d8 100755 --- a/packages/x11/driver/xf86-video-vesa/install +++ b/packages/x11/driver/xf86-video-vesa/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers -cp $BUILD/$1*/src/.libs/vesa_drv.so $INSTALL/$XORG_PATH_MODULES/drivers +cp $PKG_BUILD/src/.libs/vesa_drv.so $INSTALL/$XORG_PATH_MODULES/drivers diff --git a/packages/x11/font/encodings/build b/packages/x11/font/encodings/build index 1089ab8d7c..6b7621d08a 100755 --- a/packages/x11/font/encodings/build +++ b/packages/x11/font/encodings/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/font/encodings/install b/packages/x11/font/encodings/install index ae215d0c98..0f2f5c72c1 100755 --- a/packages/x11/font/encodings/install +++ b/packages/x11/font/encodings/install @@ -3,7 +3,7 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_ENCODINGS -cp $BUILD/$1*/*.enc $INSTALL/$XORG_PATH_ENCODINGS +cp $PKG_BUILD/*.enc $INSTALL/$XORG_PATH_ENCODINGS mkdir -p $INSTALL/$XORG_PATH_ENCODINGS/large -cp $BUILD/$1*/large/*.enc $INSTALL/$XORG_PATH_ENCODINGS/large +cp $PKG_BUILD/large/*.enc $INSTALL/$XORG_PATH_ENCODINGS/large diff --git a/packages/x11/font/font-bitstream-type1/build b/packages/x11/font/font-bitstream-type1/build index 9a2cd7e9c6..62cfdf206b 100755 --- a/packages/x11/font/font-bitstream-type1/build +++ b/packages/x11/font/font-bitstream-type1/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/font/font-bitstream-type1/install b/packages/x11/font/font-bitstream-type1/install index b61e6ca761..62338d0ac9 100755 --- a/packages/x11/font/font-bitstream-type1/install +++ b/packages/x11/font/font-bitstream-type1/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_FONTS/Type1 -cp $BUILD/$1*/fonts/* $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 044ff7eae4..12435e5cba 100755 --- a/packages/x11/font/font-cursor-misc/build +++ b/packages/x11/font/font-cursor-misc/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build font-util -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/font/font-misc-misc/build b/packages/x11/font/font-misc-misc/build index 041be5a0c9..97d41210b8 100755 --- a/packages/x11/font/font-misc-misc/build +++ b/packages/x11/font/font-misc-misc/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build font-cursor-misc $SCRIPTS/build font-util -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/font/font-misc-misc/install b/packages/x11/font/font-misc-misc/install index cb0b376328..4daf62977a 100755 --- a/packages/x11/font/font-misc-misc/install +++ b/packages/x11/font/font-misc-misc/install @@ -8,5 +8,5 @@ $SCRIPTS/install font-util PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/$XORG_PATH_FONTS/misc -cp $BUILD/$1*/fonts/* $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 51fc5231c6..2d9dd0b898 100755 --- a/packages/x11/font/font-util/build +++ b/packages/x11/font/font-util/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain setup_toolchain host -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=$ROOT/$TOOLCHAIN \ diff --git a/packages/x11/font/font-util/install b/packages/x11/font/font-util/install index 8cdc782e07..68ee70ede5 100755 --- a/packages/x11/font/font-util/install +++ b/packages/x11/font/font-util/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_MAPS -cp $BUILD/$1*/map-* $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 f4254c3cf4..7e0a6df5ff 100755 --- a/packages/x11/font/font-xfree86-type1/build +++ b/packages/x11/font/font-xfree86-type1/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/font/font-xfree86-type1/install b/packages/x11/font/font-xfree86-type1/install index 7feddcca5c..987495ce25 100755 --- a/packages/x11/font/font-xfree86-type1/install +++ b/packages/x11/font/font-xfree86-type1/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_FONTS -cp $BUILD/$1*/cursor.pfa $INSTALL/$XORG_PATH_FONTS +cp $PKG_BUILD/cursor.pfa $INSTALL/$XORG_PATH_FONTS diff --git a/packages/x11/lib/libICE/build b/packages/x11/lib/libICE/build index 963682879e..8ee95d516f 100755 --- a/packages/x11/lib/libICE/build +++ b/packages/x11/lib/libICE/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build xtrans -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libSM/build b/packages/x11/lib/libSM/build index e5bec371d7..cc7cc12e8f 100755 --- a/packages/x11/lib/libSM/build +++ b/packages/x11/lib/libSM/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libICE -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build index a3687fd7ae..a4c148c5ad 100755 --- a/packages/x11/lib/libX11/build +++ b/packages/x11/lib/libX11/build @@ -13,7 +13,7 @@ $SCRIPTS/build libXau #$SCRIPTS/build libXdmcp #$SCRIPTS/build libxcb -cd $BUILD/$1* +cd $PKG_BUILD #autoconf ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install index e2a0f6d950..8cdad6fae6 100755 --- a/packages/x11/lib/libX11/install +++ b/packages/x11/lib/libX11/install @@ -5,8 +5,8 @@ $SCRIPTS/install libXau mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libX11*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libX11*.so*T mkdir -p $INSTALL/usr/share/X11 -cp -PR $BUILD/$1*/src/XKeysymDB $INSTALL/usr/share/X11 +cp -PR $PKG_BUILD/src/XKeysymDB $INSTALL/usr/share/X11 diff --git a/packages/x11/lib/libXau/build b/packages/x11/lib/libXau/build index e6d1009f3e..0a7921e9c1 100755 --- a/packages/x11/lib/libXau/build +++ b/packages/x11/lib/libXau/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build xproto -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXau/install b/packages/x11/lib/libXau/install index 59c50936fc..bfa813b8eb 100755 --- a/packages/x11/lib/libXau/install +++ b/packages/x11/lib/libXau/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/libXau.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/.libs/libXau.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXcomposite/build b/packages/x11/lib/libXcomposite/build index 47ff65aac1..e83f4fdddf 100755 --- a/packages/x11/lib/libXcomposite/build +++ b/packages/x11/lib/libXcomposite/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXcomposite/install b/packages/x11/lib/libXcomposite/install index 488cf03ed5..22ec7f47d0 100755 --- a/packages/x11/lib/libXcomposite/install +++ b/packages/x11/lib/libXcomposite/install @@ -5,4 +5,4 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXcomposite.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXcomposite.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXdamage/build b/packages/x11/lib/libXdamage/build index 7ac0e8041a..e7303142e6 100755 --- a/packages/x11/lib/libXdamage/build +++ b/packages/x11/lib/libXdamage/build @@ -8,7 +8,7 @@ $SCRIPTS/build fixesproto $SCRIPTS/build libX11 $SCRIPTS/build libXfixes -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXdamage/install b/packages/x11/lib/libXdamage/install index 3bfaced10e..f3dadd3a78 100755 --- a/packages/x11/lib/libXdamage/install +++ b/packages/x11/lib/libXdamage/install @@ -6,4 +6,4 @@ $SCRIPTS/install libX11 $SCRIPTS/install libXfixes mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXdamage.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXdamage.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXext/build b/packages/x11/lib/libXext/build index 78c4006552..8488a8c089 100755 --- a/packages/x11/lib/libXext/build +++ b/packages/x11/lib/libXext/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 $SCRIPTS/build xextproto -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXext/install b/packages/x11/lib/libXext/install index 9f66d4a5ed..6c9ba9cf2a 100755 --- a/packages/x11/lib/libXext/install +++ b/packages/x11/lib/libXext/install @@ -5,4 +5,4 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXext.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXext.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXfixes/build b/packages/x11/lib/libXfixes/build index 1774109b7b..df64a85700 100755 --- a/packages/x11/lib/libXfixes/build +++ b/packages/x11/lib/libXfixes/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build fixesproto $SCRIPTS/build libX11 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXfixes/install b/packages/x11/lib/libXfixes/install index 662f297ea7..95af9d4a2c 100755 --- a/packages/x11/lib/libXfixes/install +++ b/packages/x11/lib/libXfixes/install @@ -5,4 +5,4 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXfixes.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXfixes.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXfont/build b/packages/x11/lib/libXfont/build index 5cfce0e8bf..b254cd4e66 100755 --- a/packages/x11/lib/libXfont/build +++ b/packages/x11/lib/libXfont/build @@ -9,7 +9,7 @@ $SCRIPTS/build fontsproto $SCRIPTS/build freetype $SCRIPTS/build libfontenc -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXfont/install b/packages/x11/lib/libXfont/install index 8d201f3a0b..9f59655015 100755 --- a/packages/x11/lib/libXfont/install +++ b/packages/x11/lib/libXfont/install @@ -6,4 +6,4 @@ $SCRIPTS/install freetype #$SCRIPTS/install libfontenc mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXfont.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXfont.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXft/build b/packages/x11/lib/libXft/build index d5027240bc..48e42f97d4 100755 --- a/packages/x11/lib/libXft/build +++ b/packages/x11/lib/libXft/build @@ -8,7 +8,7 @@ $SCRIPTS/build freetype $SCRIPTS/build xproto $SCRIPTS/build libXrender -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXft/install b/packages/x11/lib/libXft/install index 9343c26fa7..7c786d2a46 100755 --- a/packages/x11/lib/libXft/install +++ b/packages/x11/lib/libXft/install @@ -7,4 +7,4 @@ $SCRIPTS/install freetype $SCRIPTS/install libXrender mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXi/build b/packages/x11/lib/libXi/build index 3e129034fa..5575b6a898 100755 --- a/packages/x11/lib/libXi/build +++ b/packages/x11/lib/libXi/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXi/install b/packages/x11/lib/libXi/install index d6916c72c8..250a43f4d9 100755 --- a/packages/x11/lib/libXi/install +++ b/packages/x11/lib/libXi/install @@ -5,4 +5,4 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXi.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXi.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXmu/build b/packages/x11/lib/libXmu/build index 9cbdf09e60..13f2cb3fbd 100755 --- a/packages/x11/lib/libXmu/build +++ b/packages/x11/lib/libXmu/build @@ -8,7 +8,7 @@ $SCRIPTS/build libX11 $SCRIPTS/build libXext $SCRIPTS/build libXt -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXmu/install b/packages/x11/lib/libXmu/install index 5bc2ccf0b1..6145c438ec 100755 --- a/packages/x11/lib/libXmu/install +++ b/packages/x11/lib/libXmu/install @@ -5,4 +5,4 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXpm/build b/packages/x11/lib/libXpm/build index da0cea5dcf..15e6b9eaa2 100755 --- a/packages/x11/lib/libXpm/build +++ b/packages/x11/lib/libXpm/build @@ -10,7 +10,7 @@ $SCRIPTS/build xextproto $SCRIPTS/build libXt $SCRIPTS/build libXmu -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXpm/install b/packages/x11/lib/libXpm/install index 5bc2ccf0b1..6145c438ec 100755 --- a/packages/x11/lib/libXpm/install +++ b/packages/x11/lib/libXpm/install @@ -5,4 +5,4 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXrandr/build b/packages/x11/lib/libXrandr/build index f53f487ed6..d7e2128a50 100755 --- a/packages/x11/lib/libXrandr/build +++ b/packages/x11/lib/libXrandr/build @@ -7,7 +7,7 @@ $SCRIPTS/build randrproto $SCRIPTS/build libX11 $SCRIPTS/build libXrender -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXrandr/install b/packages/x11/lib/libXrandr/install index efb2c9d71d..a0686e75da 100755 --- a/packages/x11/lib/libXrandr/install +++ b/packages/x11/lib/libXrandr/install @@ -6,4 +6,4 @@ $SCRIPTS/install libX11 $SCRIPTS/install libXrender mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXrandr.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXrandr.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXrender/build b/packages/x11/lib/libXrender/build index a533ad3b05..5803744dc5 100755 --- a/packages/x11/lib/libXrender/build +++ b/packages/x11/lib/libXrender/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build renderproto $SCRIPTS/build libX11 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXrender/install b/packages/x11/lib/libXrender/install index da917cb34c..80e784a633 100755 --- a/packages/x11/lib/libXrender/install +++ b/packages/x11/lib/libXrender/install @@ -5,4 +5,4 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXrender.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXrender.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXt/build b/packages/x11/lib/libXt/build index 0613b3ee9b..99936a84f4 100755 --- a/packages/x11/lib/libXt/build +++ b/packages/x11/lib/libXt/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXt/install b/packages/x11/lib/libXt/install index 5bc2ccf0b1..6145c438ec 100755 --- a/packages/x11/lib/libXt/install +++ b/packages/x11/lib/libXt/install @@ -5,4 +5,4 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/lib -cp -P $BUILD/$1*/src/.libs/*.so* $INSTALL/usr/lib +cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXv/build b/packages/x11/lib/libXv/build index 380d35d20f..856ba1fc89 100755 --- a/packages/x11/lib/libXv/build +++ b/packages/x11/lib/libXv/build @@ -7,7 +7,7 @@ $SCRIPTS/build videoproto $SCRIPTS/build libX11 $SCRIPTS/build libXext -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXv/install b/packages/x11/lib/libXv/install index 46b07a6f28..e64f759591 100755 --- a/packages/x11/lib/libXv/install +++ b/packages/x11/lib/libXv/install @@ -6,4 +6,4 @@ $SCRIPTS/install libX11 $SCRIPTS/install libXext mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXv.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXv.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXvMC/build b/packages/x11/lib/libXvMC/build index 19e57007ba..e236f2fc5e 100755 --- a/packages/x11/lib/libXvMC/build +++ b/packages/x11/lib/libXvMC/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXxf86vm/build b/packages/x11/lib/libXxf86vm/build index 2bb4d3f89d..21361cc4e4 100755 --- a/packages/x11/lib/libXxf86vm/build +++ b/packages/x11/lib/libXxf86vm/build @@ -7,7 +7,7 @@ $SCRIPTS/build xf86vidmodeproto $SCRIPTS/build libX11 $SCRIPTS/build libXext -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libXxf86vm/install b/packages/x11/lib/libXxf86vm/install index 9d514c783b..b3e34cd4f4 100755 --- a/packages/x11/lib/libXxf86vm/install +++ b/packages/x11/lib/libXxf86vm/install @@ -6,4 +6,4 @@ $SCRIPTS/install libX11 $SCRIPTS/install libXext mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libXxf86vm.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libXxf86vm.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libfontenc/build b/packages/x11/lib/libfontenc/build index d8e0252ed2..9b2701af58 100755 --- a/packages/x11/lib/libfontenc/build +++ b/packages/x11/lib/libfontenc/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build xproto $SCRIPTS/build zlib -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libpciaccess/build b/packages/x11/lib/libpciaccess/build index 00133ef7b2..0f27fcccf5 100755 --- a/packages/x11/lib/libpciaccess/build +++ b/packages/x11/lib/libpciaccess/build @@ -7,7 +7,7 @@ $SCRIPTS/build zlib export ac_cv_header_asm_mtrr_h=set -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/libpciaccess/install b/packages/x11/lib/libpciaccess/install index 0b327d72ed..ae63572ec8 100755 --- a/packages/x11/lib/libpciaccess/install +++ b/packages/x11/lib/libpciaccess/install @@ -4,8 +4,8 @@ $SCRIPTS/install zlib mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libpciaccess.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/src/.libs/libpciaccess.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/src/.libs/scanpci $INSTALL/usr/bin +cp -PR $PKG_BUILD/src/.libs/scanpci $INSTALL/usr/bin diff --git a/packages/x11/lib/libxkbfile/build b/packages/x11/lib/libxkbfile/build index 349397f477..b0c48e0727 100755 --- a/packages/x11/lib/libxkbfile/build +++ b/packages/x11/lib/libxkbfile/build @@ -6,7 +6,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 #$SCRIPTS/build xkbdata -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/pixman/build b/packages/x11/lib/pixman/build index 7506ecd432..157a66a0e1 100755 --- a/packages/x11/lib/pixman/build +++ b/packages/x11/lib/pixman/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/lib/pixman/install b/packages/x11/lib/pixman/install index 681ae23b45..8cc7b7ddcf 100755 --- a/packages/x11/lib/pixman/install +++ b/packages/x11/lib/pixman/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/pixman/.libs/*.so* $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 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/lib/xtrans/build +++ b/packages/x11/lib/xtrans/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/other/mrxvt/build b/packages/x11/other/mrxvt/build index cccf3ca5a5..62ce3729df 100755 --- a/packages/x11/other/mrxvt/build +++ b/packages/x11/other/mrxvt/build @@ -7,7 +7,7 @@ $SCRIPTS/build libX11 $SCRIPTS/build libXrender -cd $BUILD/$1* +cd $PKG_BUILD ac_cv_func_setpgrp_void=no \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/x11/other/mrxvt/install b/packages/x11/other/mrxvt/install index f154f8d9ac..6011ab6b98 100755 --- a/packages/x11/other/mrxvt/install +++ b/packages/x11/other/mrxvt/install @@ -4,5 +4,5 @@ $SCRIPTS/install libX11 mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/src/$1 $INSTALL/usr/bin +cp $PKG_BUILD/src/$1 $INSTALL/usr/bin diff --git a/packages/x11/other/openbox/build b/packages/x11/other/openbox/build index f7ec9ad9fc..fbd1917c33 100755 --- a/packages/x11/other/openbox/build +++ b/packages/x11/other/openbox/build @@ -9,7 +9,7 @@ $SCRIPTS/build pango $SCRIPTS/build libXft $SCRIPTS/build libxml2 -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/other/openbox/install b/packages/x11/other/openbox/install index 53bb2ff88f..41d3aee972 100755 --- a/packages/x11/other/openbox/install +++ b/packages/x11/other/openbox/install @@ -10,15 +10,15 @@ $SCRIPTS/install libxml2 PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/bin -cp -PR $BUILD/$1*/$1/.libs/$1 $INSTALL/usr/bin +cp -PR $PKG_BUILD/$1/.libs/$1 $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/parser/.libs/*.so* $INSTALL/usr/lib -cp -PR $BUILD/$1*/render/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/parser/.libs/*.so* $INSTALL/usr/lib +cp -PR $PKG_BUILD/render/.libs/*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/*.so*T mkdir -p $INSTALL/usr/share/themes -cp -RP $BUILD/$1*/themes/Clearlooks $INSTALL/usr/share/themes +cp -RP $PKG_BUILD/themes/Clearlooks $INSTALL/usr/share/themes mkdir -p $INSTALL/etc/xdg/openbox cp -PR $PKG_DIR/config/rc.xml $INSTALL/etc/xdg/openbox diff --git a/packages/x11/proto/bigreqsproto/build b/packages/x11/proto/bigreqsproto/build index 46b9326798..94fa3b5898 100755 --- a/packages/x11/proto/bigreqsproto/build +++ b/packages/x11/proto/bigreqsproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/compositeproto/build b/packages/x11/proto/compositeproto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/compositeproto/build +++ b/packages/x11/proto/compositeproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/damageproto/build b/packages/x11/proto/damageproto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/damageproto/build +++ b/packages/x11/proto/damageproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/dri2proto/build b/packages/x11/proto/dri2proto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/dri2proto/build +++ b/packages/x11/proto/dri2proto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/fixesproto/build b/packages/x11/proto/fixesproto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/fixesproto/build +++ b/packages/x11/proto/fixesproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/fontcacheproto/build b/packages/x11/proto/fontcacheproto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/fontcacheproto/build +++ b/packages/x11/proto/fontcacheproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/fontsproto/build b/packages/x11/proto/fontsproto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/fontsproto/build +++ b/packages/x11/proto/fontsproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/glproto/build b/packages/x11/proto/glproto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/glproto/build +++ b/packages/x11/proto/glproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/inputproto/build b/packages/x11/proto/inputproto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/inputproto/build +++ b/packages/x11/proto/inputproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/kbproto/build b/packages/x11/proto/kbproto/build index 61a168bf6a..ee2f0b3315 100755 --- a/packages/x11/proto/kbproto/build +++ b/packages/x11/proto/kbproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/randrproto/build b/packages/x11/proto/randrproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/randrproto/build +++ b/packages/x11/proto/randrproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/renderproto/build b/packages/x11/proto/renderproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/renderproto/build +++ b/packages/x11/proto/renderproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/resourceproto/build b/packages/x11/proto/resourceproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/resourceproto/build +++ b/packages/x11/proto/resourceproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/scrnsaverproto/build b/packages/x11/proto/scrnsaverproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/scrnsaverproto/build +++ b/packages/x11/proto/scrnsaverproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/videoproto/build b/packages/x11/proto/videoproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/videoproto/build +++ b/packages/x11/proto/videoproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xcb-proto/build b/packages/x11/proto/xcb-proto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xcb-proto/build +++ b/packages/x11/proto/xcb-proto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xcmiscproto/build b/packages/x11/proto/xcmiscproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xcmiscproto/build +++ b/packages/x11/proto/xcmiscproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xextproto/build b/packages/x11/proto/xextproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xextproto/build +++ b/packages/x11/proto/xextproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xf86bigfontproto/build b/packages/x11/proto/xf86bigfontproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xf86bigfontproto/build +++ b/packages/x11/proto/xf86bigfontproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xf86dgaproto/build b/packages/x11/proto/xf86dgaproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xf86dgaproto/build +++ b/packages/x11/proto/xf86dgaproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xf86driproto/build b/packages/x11/proto/xf86driproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xf86driproto/build +++ b/packages/x11/proto/xf86driproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xf86miscproto/build b/packages/x11/proto/xf86miscproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xf86miscproto/build +++ b/packages/x11/proto/xf86miscproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xf86vidmodeproto/build b/packages/x11/proto/xf86vidmodeproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xf86vidmodeproto/build +++ b/packages/x11/proto/xf86vidmodeproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xineramaproto/build b/packages/x11/proto/xineramaproto/build index 50eb7b7c5b..61467203fa 100755 --- a/packages/x11/proto/xineramaproto/build +++ b/packages/x11/proto/xineramaproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/proto/xproto/build b/packages/x11/proto/xproto/build index 45c7bf3517..c56cbfa8e0 100755 --- a/packages/x11/proto/xproto/build +++ b/packages/x11/proto/xproto/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/util/util-macros/build b/packages/x11/util/util-macros/build index c4d8779fc3..f4aac6e467 100755 --- a/packages/x11/util/util-macros/build +++ b/packages/x11/util/util-macros/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain -cd $BUILD/$1* +cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 30777d300b..2628ea20d1 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -2,7 +2,7 @@ . config/options -XORG_SRC="$BUILD/$1*/hw/xfree86" +XORG_SRC="$PKG_BUILD/hw/xfree86" $SCRIPTS/build toolchain @@ -34,7 +34,7 @@ $SCRIPTS/build xf86bigfontproto $SCRIPTS/build dbus $SCRIPTS/build hal -cd $BUILD/$1* +cd $PKG_BUILD autoconf ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 8634f0e30c..9091e26b4e 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -15,7 +15,7 @@ $SCRIPTS/install pixman $SCRIPTS/install dbus $SCRIPTS/install hal -XORG_SRC="$BUILD/$1*/hw/xfree86" +XORG_SRC="$PKG_BUILD/hw/xfree86" XORG_DST="$INSTALL/$XORG_PATH_MODULES" mkdir -p $INSTALL/usr/bin @@ -58,10 +58,10 @@ mkdir -p $XORG_DST/multimedia cp $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia mkdir -p $INSTALL/etc/X11 -cp $BUILD/$1*/dix/protocol.txt $INSTALL/etc/X11 +cp $PKG_BUILD/dix/protocol.txt $INSTALL/etc/X11 mkdir -p $INSTALL/etc/dbus-1/system.d -cp $BUILD/$1*/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d +cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ -cp $BUILD/$1*/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi +cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi diff --git a/scripts/build b/scripts/build index 266d1a6b46..1781053c11 100755 --- a/scripts/build +++ b/scripts/build @@ -44,9 +44,9 @@ if [ ! -f $STAMP ]; then for i in `find $SYSROOT_PREFIX/usr/lib/ -name "*.pc"`; do \ $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $i; \ done - elif [ -f $BUILD/$1*/Makefile ]; then + elif [ -f $PKG_BUILD/Makefile ]; then $SCRIPTS/build toolchain - make -C $BUILD/$1* >&$VERBOSE_OUT + make -C $PKG_BUILD >&$VERBOSE_OUT for i in `find $SYSROOT_PREFIX/usr/lib/ -name "*.la"`; do \ $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $i; \ done @@ -55,9 +55,9 @@ if [ ! -f $STAMP ]; then done elif [ "$1" != "${1#theme-}" ]; then $SCRIPTS/build-theme $@ >&$VERBOSE_OUT - elif [ -f $BUILD/$1*/$1.c ]; then + elif [ -f $PKG_BUILD/$1.c ]; then $SCRIPTS/build toolchain - make -C $BUILD/$1* $1 >&$VERBOSE_OUT + make -C $PKG_BUILD $1 >&$VERBOSE_OUT fi . $CONFIG/options diff --git a/scripts/clean b/scripts/clean index 57960ce4d3..7dcd3fe4d6 100755 --- a/scripts/clean +++ b/scripts/clean @@ -23,7 +23,7 @@ clean () rm -rf $STAMPS_NOARCH/$1 rm -rf $SOURCES/$1 else - rm -rf $BUILD/$1* + rm -rf $PKG_BUILD rm -f $STAMPS/$1*/unpack rm -f $STAMPS/$1*/build fi diff --git a/scripts/install b/scripts/install index 3a9b653c12..898240c3b0 100755 --- a/scripts/install +++ b/scripts/install @@ -37,5 +37,5 @@ if [ -f $PKG_DIR/install ]; then $PKG_DIR/install $@ >&$VERBOSE_OUT else mkdir -p $INSTALL/usr/bin - cp $BUILD/$1*/$1 $INSTALL/usr/bin + cp $PKG_BUILD/$1 $INSTALL/usr/bin fi