# HG changeset patch # User Pascal Bellard # Date 1386276156 0 # Node ID ee5c8b018b6261599da136abe26b6efb5d31b713 # Parent 23c3aed67cd9b9ed88fb42dc1d1643b9a74f7626 Use DESTDIR diff -r 23c3aed67cd9 -r ee5c8b018b62 backuppc/receipt --- a/backuppc/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/backuppc/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -28,7 +28,7 @@ sed -i -e 's|/doc|/share/BackupPC/doc|' \ -e 's|bin doc|bin share/BackupPC/doc|' \ configure.pl - perl configure.pl --batch --dest-dir=$PWD/_pkg --install-dir=/usr \ + perl configure.pl --batch --dest-dir=$DESTDIR --install-dir=/usr \ --data-dir=/var/lib/BackupPC --config-dir=/etc/BackupPC \ --log-dir=/var/log/BackupPC --backuppc-user=www \ --hostname=localhost --html-dir=/usr/share/BackupPC/www \ diff -r 23c3aed67cd9 -r ee5c8b018b62 cromfs/receipt --- a/cromfs/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/cromfs/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -26,7 +26,7 @@ mkdir -p $DESTDIR/bin $DESTDIR/usr/bin cp $src/cromfs-driver $DESTDIR/bin # Maybe have a plited packages (cromfs-static) - #cp $src/cromfs-driver-static $PWD/_pkg/bin/cromfs-driver + #cp $src/cromfs-driver-static $DESTDIR/bin/cromfs-driver cp $src/util/cvcromfs $DESTDIR/usr/bin cp $src/util/mkcromfs $DESTDIR/usr/bin cp $src/util/unmkcromfs $DESTDIR/bin diff -r 23c3aed67cd9 -r ee5c8b018b62 cryptopp/receipt --- a/cryptopp/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/cryptopp/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -16,7 +16,7 @@ patch -Np1 < $stuff/$PACKAGE-$VERSION-gcc-4.7.0.patch make make libcryptopp.so - make PREFIX=$PWD/_pkg/usr install + make PREFIX=$DESTDIR/usr install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 freeimage/receipt --- a/freeimage/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/freeimage/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -19,7 +19,7 @@ { cd $src patch -Np1 -i $stuff/gcc4.5_ln.patch - pkgdir=$PWD/_pkg + pkgdir=$DESTDIR incl=$pkgdir/usr/include dest=$pkgdir/usr/lib install -d $dest diff -r 23c3aed67cd9 -r ee5c8b018b62 freetype1/receipt --- a/freetype1/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/freetype1/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -20,11 +20,11 @@ cd $src ./configure \ - --sysconfdir=$PWD/_pkg/etc \ - --prefix=$PWD/_pkg/usr \ - --mandir=$PWD/_pkg/usr/share/man \ - --includedir=$PWD/_pkg/usr/include \ - --libdir=$PWD/_pkg/usr/lib \ + --sysconfdir=$DESTDIR/etc \ + --prefix=$DESTDIR/usr \ + --mandir=$DESTDIR/usr/share/man \ + --includedir=$DESTDIR/usr/include \ + --libdir=$DESTDIR/usr/lib \ --with-x --enable-gif \ $CONFIGURE_ARGS && make ttlib ttpo || return 1 diff -r 23c3aed67cd9 -r ee5c8b018b62 gnome-menus/receipt --- a/gnome-menus/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/gnome-menus/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -23,7 +23,7 @@ --mandir=/usr/share/man \ $CONFIGURE_ARGS && make && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 h8300-binutils/receipt --- a/h8300-binutils/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/h8300-binutils/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -31,7 +31,7 @@ --mandir=/usr/share/man \ $CONFIGURE_ARGS && make $MAKEFLAGS && - make DESTDIR=$src/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 icinga/receipt --- a/icinga/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/icinga/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -36,7 +36,7 @@ --with-mail=/usr/bin/mailx \ $CONFIGURE_ARGS && make all && \ - make DESTDIR=$PWD/_pkg install \ + make DESTDIR=$DESTDIR install \ install-commandmode \ install-config \ install-webconf \ diff -r 23c3aed67cd9 -r ee5c8b018b62 libgtkhtml/receipt --- a/libgtkhtml/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/libgtkhtml/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -26,7 +26,7 @@ --infodir=/usr/share/info \ --mandir=/usr/share/man \ $CONFIGURE_ARGS && - make && make DESTDIR=$PWD/_pkg install + make && make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 libsdl-pango/receipt --- a/libsdl-pango/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/libsdl-pango/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -25,7 +25,7 @@ --infodir=/usr/share/info \ --mandir=/usr/share/man \ $CONFIGURE_ARGS && - make && make DESTDIR=$PWD/_pkg install + make && make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 libvalhalla/receipt --- a/libvalhalla/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/libvalhalla/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -33,7 +33,7 @@ sed -i 's/"\$@" >>\$logfile 2/$@ >>$logfile 2/' configure ./configure \ --prefix=/usr && - make && make DESTDIR=$PWD/_pkg install + make && make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 linux-libre/receipt --- a/linux-libre/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/linux-libre/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -97,8 +97,8 @@ -e 's/^CONFIG_RT2870/#&/' .config yes '' | make oldconfig make $MAKEFLAGS bzImage || { report close-bloc; return 1; } - [ -d $PWD/_pkg ] || mkdir -p $PWD/_pkg - mv arch/x86/boot/bzImage $PWD/_pkg + [ -d $DESTDIR ] || mkdir -p $DESTDIR + mv arch/x86/boot/bzImage $DESTDIR mv System.map System.map-without-modules [ ! -x /usr/bin/cook ] && report step "Now build bzImage with modules" @@ -109,16 +109,16 @@ ln .config $WOK/$PACKAGE/slitaz/config make $MAKEFLAGS bzImage && make $MAKEFLAGS modules && - make INSTALL_MOD_PATH=$PWD/_pkg modules_install && - make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install && + make INSTALL_MOD_PATH=$DESTDIR modules_install && + make INSTALL_HDR_PATH=$DESTDIR/usr headers_install && [ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; } - mkdir -p $PWD/_pkg/boot 2> /dev/null - mv arch/x86/boot/bzImage $PWD/_pkg/boot/vmlinuz-$VERSION-slitaz + mkdir -p $DESTDIR/boot 2> /dev/null + mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz [ ! -x /usr/bin/cook ] && report step "Compressing all modules" # Compress all modules. - $stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz + $stuff/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz ln System.map System.map-modules ln Module.symvers Module.symvers-modules diff -r 23c3aed67cd9 -r ee5c8b018b62 linux/receipt --- a/linux/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/linux/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -181,7 +181,7 @@ elif [ -x /usr/bin/tazwok ]; then make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || { report close-bloc; return 1; } fi - [ -d $PWD/_pkg ] || mkdir -p $DESTDIR/linux64 + [ -d $DESTDIR ] || mkdir -p $DESTDIR/linux64 mv arch/x86/boot/bzImage $DESTDIR/linux64 mv System.map System.map-without-modules64 diff -r 23c3aed67cd9 -r ee5c8b018b62 linuxdcpp/receipt --- a/linuxdcpp/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/linuxdcpp/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -15,9 +15,9 @@ compile_rules() { cd $src - mkdir -p $PWD/_pkg/usr + mkdir -p $DESTDIR/usr scons PREFIX=/usr && - scons PREFIX=$PWD/_pkg/usr install + scons PREFIX=$DESTDIR/usr install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 magnifier/receipt --- a/magnifier/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/magnifier/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -17,7 +17,7 @@ compile_rules() { cd $src - ./install.sh DESTDIR=$PWD/_pkg install + ./install.sh DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 maxima/receipt --- a/maxima/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/maxima/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -21,7 +21,7 @@ --localstatedir=/var \ $CONFIGURE_ARGS && make -j 1 && make -j 1 check && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 openvas-libraries/receipt --- a/openvas-libraries/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/openvas-libraries/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -21,7 +21,7 @@ --mandir=/usr/share/man \ $CONFIGURE_ARGS && make && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 qjackctl/receipt --- a/qjackctl/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/qjackctl/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -25,7 +25,7 @@ #sed -i 's|^LIBS.*|& -Wl,--copy-dt-needed-entries -lX11|' qjackctl.pro.in ./configure $CONFIGURE_ARGS && make && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 sonata/receipt --- a/sonata/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/sonata/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -18,7 +18,7 @@ compile_rules() { cd $src - python setup.py install --prefix=/usr --root="$PWD/_pkg" + python setup.py install --prefix=/usr --root="$DESTDIR" } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 visualnqc/receipt --- a/visualnqc/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/visualnqc/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -17,8 +17,8 @@ compile_rules() { cd $src - mkdir -p $src/_pkg - cp -a $src/usr $src/_pkg + mkdir -p $DESTDIR + cp -a $src/usr $DESTDIR } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 23c3aed67cd9 -r ee5c8b018b62 xalan-xerces-j/receipt --- a/xalan-xerces-j/receipt Thu Dec 05 20:23:08 2013 +0000 +++ b/xalan-xerces-j/receipt Thu Dec 05 20:42:36 2013 +0000 @@ -21,8 +21,8 @@ [ -d ${SOURCE}_2_7_1 ] && mv ${SOURCE}_2_7_1 $src cd $src - mkdir -p $src/_pkg/usr/share/java && - cp -f $src/*.jar $src/_pkg/usr/share/java + mkdir -p $DESTDIR/usr/share/java && + cp -f $src/*.jar $DESTDIR/usr/share/java } # Rules to gen a SliTaz package suitable for Tazpkg.