Navigation

Project: wok

Clone project: hg clone http://hg.slitaz.org/wok

  • Download tarball:
  • bz2
  • gz

Search

wok changeset 15602:ee5c8b018b62

Use DESTDIR
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Dec 05 20:42:36 2013 +0000 (10 months ago ago)
parents 23c3aed67cd9
children 051931e905b0
files backuppc/receipt cromfs/receipt cryptopp/receipt freeimage/receipt freetype1/receipt gnome-menus/receipt h8300-binutils/receipt icinga/receipt libgtkhtml/receipt libsdl-pango/receipt libvalhalla/receipt linux-libre/receipt linux/receipt linuxdcpp/receipt magnifier/receipt maxima/receipt openvas-libraries/receipt qjackctl/receipt sonata/receipt visualnqc/receipt xalan-xerces-j/receipt
line diff
     1.1 --- a/backuppc/receipt	Thu Dec 05 20:23:08 2013 +0000
     1.2 +++ b/backuppc/receipt	Thu Dec 05 20:42:36 2013 +0000
     1.3 @@ -28,7 +28,7 @@
     1.4  	sed -i -e 's|/doc|/share/BackupPC/doc|' \
     1.5  		-e 's|bin doc|bin share/BackupPC/doc|' \
     1.6  		configure.pl
     1.7 -	perl configure.pl --batch --dest-dir=$PWD/_pkg --install-dir=/usr \
     1.8 +	perl configure.pl --batch --dest-dir=$DESTDIR --install-dir=/usr \
     1.9  		--data-dir=/var/lib/BackupPC --config-dir=/etc/BackupPC \
    1.10  		--log-dir=/var/log/BackupPC --backuppc-user=www \
    1.11  		--hostname=localhost --html-dir=/usr/share/BackupPC/www \
     2.1 --- a/cromfs/receipt	Thu Dec 05 20:23:08 2013 +0000
     2.2 +++ b/cromfs/receipt	Thu Dec 05 20:42:36 2013 +0000
     2.3 @@ -26,7 +26,7 @@
     2.4  	mkdir -p $DESTDIR/bin $DESTDIR/usr/bin
     2.5  	cp $src/cromfs-driver $DESTDIR/bin
     2.6  	# Maybe have a plited packages (cromfs-static)
     2.7 -	#cp $src/cromfs-driver-static $PWD/_pkg/bin/cromfs-driver
     2.8 +	#cp $src/cromfs-driver-static $DESTDIR/bin/cromfs-driver
     2.9  	cp $src/util/cvcromfs $DESTDIR/usr/bin
    2.10  	cp $src/util/mkcromfs $DESTDIR/usr/bin
    2.11  	cp $src/util/unmkcromfs $DESTDIR/bin
     3.1 --- a/cryptopp/receipt	Thu Dec 05 20:23:08 2013 +0000
     3.2 +++ b/cryptopp/receipt	Thu Dec 05 20:42:36 2013 +0000
     3.3 @@ -16,7 +16,7 @@
     3.4  	patch -Np1 < $stuff/$PACKAGE-$VERSION-gcc-4.7.0.patch
     3.5  	make 
     3.6  	make libcryptopp.so
     3.7 -	make PREFIX=$PWD/_pkg/usr install
     3.8 +	make PREFIX=$DESTDIR/usr install
     3.9  }
    3.10  
    3.11  # Rules to gen a SliTaz package suitable for Tazpkg.
     4.1 --- a/freeimage/receipt	Thu Dec 05 20:23:08 2013 +0000
     4.2 +++ b/freeimage/receipt	Thu Dec 05 20:42:36 2013 +0000
     4.3 @@ -19,7 +19,7 @@
     4.4  {
     4.5  	cd $src
     4.6  	patch -Np1 -i $stuff/gcc4.5_ln.patch
     4.7 -	pkgdir=$PWD/_pkg
     4.8 +	pkgdir=$DESTDIR
     4.9  	incl=$pkgdir/usr/include
    4.10      dest=$pkgdir/usr/lib
    4.11  	install -d $dest
     5.1 --- a/freetype1/receipt	Thu Dec 05 20:23:08 2013 +0000
     5.2 +++ b/freetype1/receipt	Thu Dec 05 20:42:36 2013 +0000
     5.3 @@ -20,11 +20,11 @@
     5.4  
     5.5  	cd $src
     5.6  	./configure \
     5.7 -		--sysconfdir=$PWD/_pkg/etc \
     5.8 -		--prefix=$PWD/_pkg/usr \
     5.9 -		--mandir=$PWD/_pkg/usr/share/man \
    5.10 -		--includedir=$PWD/_pkg/usr/include \
    5.11 -		--libdir=$PWD/_pkg/usr/lib \
    5.12 +		--sysconfdir=$DESTDIR/etc \
    5.13 +		--prefix=$DESTDIR/usr \
    5.14 +		--mandir=$DESTDIR/usr/share/man \
    5.15 +		--includedir=$DESTDIR/usr/include \
    5.16 +		--libdir=$DESTDIR/usr/lib \
    5.17  		--with-x --enable-gif \
    5.18  		$CONFIGURE_ARGS &&
    5.19  	make ttlib ttpo || return 1
     6.1 --- a/gnome-menus/receipt	Thu Dec 05 20:23:08 2013 +0000
     6.2 +++ b/gnome-menus/receipt	Thu Dec 05 20:42:36 2013 +0000
     6.3 @@ -23,7 +23,7 @@
     6.4  		--mandir=/usr/share/man \
     6.5  		$CONFIGURE_ARGS &&
     6.6  	make &&
     6.7 -	make DESTDIR=$PWD/_pkg install
     6.8 +	make DESTDIR=$DESTDIR install
     6.9  }
    6.10  
    6.11  # Rules to gen a SliTaz package suitable for Tazpkg.
     7.1 --- a/h8300-binutils/receipt	Thu Dec 05 20:23:08 2013 +0000
     7.2 +++ b/h8300-binutils/receipt	Thu Dec 05 20:42:36 2013 +0000
     7.3 @@ -31,7 +31,7 @@
     7.4  		--mandir=/usr/share/man \
     7.5  		$CONFIGURE_ARGS &&
     7.6  	make $MAKEFLAGS &&
     7.7 -	make DESTDIR=$src/_pkg install
     7.8 +	make DESTDIR=$DESTDIR install
     7.9  }
    7.10  
    7.11  # Rules to gen a SliTaz package suitable for Tazpkg.
     8.1 --- a/icinga/receipt	Thu Dec 05 20:23:08 2013 +0000
     8.2 +++ b/icinga/receipt	Thu Dec 05 20:42:36 2013 +0000
     8.3 @@ -36,7 +36,7 @@
     8.4  		--with-mail=/usr/bin/mailx \
     8.5  		$CONFIGURE_ARGS &&
     8.6  	make all && \
     8.7 -	make DESTDIR=$PWD/_pkg install \
     8.8 +	make DESTDIR=$DESTDIR install \
     8.9  	    install-commandmode \
    8.10  		install-config \
    8.11  		install-webconf \
     9.1 --- a/libgtkhtml/receipt	Thu Dec 05 20:23:08 2013 +0000
     9.2 +++ b/libgtkhtml/receipt	Thu Dec 05 20:42:36 2013 +0000
     9.3 @@ -26,7 +26,7 @@
     9.4  		--infodir=/usr/share/info \
     9.5  		--mandir=/usr/share/man \
     9.6  		$CONFIGURE_ARGS &&
     9.7 -	make && make DESTDIR=$PWD/_pkg install
     9.8 +	make && make DESTDIR=$DESTDIR install
     9.9  }
    9.10  
    9.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    10.1 --- a/libsdl-pango/receipt	Thu Dec 05 20:23:08 2013 +0000
    10.2 +++ b/libsdl-pango/receipt	Thu Dec 05 20:42:36 2013 +0000
    10.3 @@ -25,7 +25,7 @@
    10.4  		--infodir=/usr/share/info \
    10.5  		--mandir=/usr/share/man \
    10.6  		$CONFIGURE_ARGS &&
    10.7 -	make && make DESTDIR=$PWD/_pkg install
    10.8 +	make && make DESTDIR=$DESTDIR install
    10.9  }
   10.10  
   10.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    11.1 --- a/libvalhalla/receipt	Thu Dec 05 20:23:08 2013 +0000
    11.2 +++ b/libvalhalla/receipt	Thu Dec 05 20:42:36 2013 +0000
    11.3 @@ -33,7 +33,7 @@
    11.4  	sed -i 's/"\$@" >>\$logfile 2/$@ >>$logfile 2/' configure
    11.5  	./configure \
    11.6  		--prefix=/usr &&
    11.7 -	make && make DESTDIR=$PWD/_pkg install
    11.8 +	make && make DESTDIR=$DESTDIR install
    11.9  }
   11.10  
   11.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    12.1 --- a/linux-libre/receipt	Thu Dec 05 20:23:08 2013 +0000
    12.2 +++ b/linux-libre/receipt	Thu Dec 05 20:42:36 2013 +0000
    12.3 @@ -97,8 +97,8 @@
    12.4  	       -e 's/^CONFIG_RT2870/#&/' .config
    12.5  	yes '' | make oldconfig
    12.6  	make $MAKEFLAGS bzImage || { report close-bloc; return 1; }
    12.7 -	[ -d $PWD/_pkg ] || mkdir -p $PWD/_pkg
    12.8 -	mv arch/x86/boot/bzImage $PWD/_pkg
    12.9 +	[ -d $DESTDIR ] || mkdir -p $DESTDIR
   12.10 +	mv arch/x86/boot/bzImage $DESTDIR
   12.11  	mv System.map System.map-without-modules
   12.12  
   12.13  	[ ! -x /usr/bin/cook ] && report step "Now build bzImage with modules"
   12.14 @@ -109,16 +109,16 @@
   12.15  	ln .config $WOK/$PACKAGE/slitaz/config
   12.16  	make $MAKEFLAGS bzImage &&
   12.17  	make $MAKEFLAGS modules &&
   12.18 -	make INSTALL_MOD_PATH=$PWD/_pkg modules_install &&
   12.19 -	make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install &&
   12.20 +	make INSTALL_MOD_PATH=$DESTDIR modules_install &&
   12.21 +	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install &&
   12.22  	[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
   12.23 -	mkdir -p $PWD/_pkg/boot 2> /dev/null
   12.24 -	mv arch/x86/boot/bzImage $PWD/_pkg/boot/vmlinuz-$VERSION-slitaz
   12.25 +	mkdir -p $DESTDIR/boot 2> /dev/null
   12.26 +	mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz
   12.27  	
   12.28  	[ ! -x /usr/bin/cook ] && report step "Compressing all modules"
   12.29  	
   12.30  	# Compress all modules.
   12.31 -	$stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz
   12.32 +	$stuff/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz
   12.33  	ln System.map System.map-modules
   12.34  	ln Module.symvers Module.symvers-modules
   12.35  	
    13.1 --- a/linux/receipt	Thu Dec 05 20:23:08 2013 +0000
    13.2 +++ b/linux/receipt	Thu Dec 05 20:42:36 2013 +0000
    13.3 @@ -181,7 +181,7 @@
    13.4  	elif [ -x /usr/bin/tazwok ]; then
    13.5  		make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || { report close-bloc; return 1; }
    13.6  	fi
    13.7 -	[ -d $PWD/_pkg ] || mkdir -p $DESTDIR/linux64
    13.8 +	[ -d $DESTDIR ] || mkdir -p $DESTDIR/linux64
    13.9  	mv arch/x86/boot/bzImage $DESTDIR/linux64
   13.10  	mv System.map System.map-without-modules64
   13.11  
    14.1 --- a/linuxdcpp/receipt	Thu Dec 05 20:23:08 2013 +0000
    14.2 +++ b/linuxdcpp/receipt	Thu Dec 05 20:42:36 2013 +0000
    14.3 @@ -15,9 +15,9 @@
    14.4  compile_rules()
    14.5  {
    14.6  	cd $src
    14.7 -	mkdir -p $PWD/_pkg/usr
    14.8 +	mkdir -p $DESTDIR/usr
    14.9  	scons PREFIX=/usr &&
   14.10 -	scons PREFIX=$PWD/_pkg/usr install
   14.11 +	scons PREFIX=$DESTDIR/usr install
   14.12  }
   14.13  
   14.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    15.1 --- a/magnifier/receipt	Thu Dec 05 20:23:08 2013 +0000
    15.2 +++ b/magnifier/receipt	Thu Dec 05 20:42:36 2013 +0000
    15.3 @@ -17,7 +17,7 @@
    15.4  compile_rules()
    15.5  {
    15.6  	cd $src
    15.7 -	./install.sh DESTDIR=$PWD/_pkg install
    15.8 +	./install.sh DESTDIR=$DESTDIR install
    15.9  }
   15.10  
   15.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    16.1 --- a/maxima/receipt	Thu Dec 05 20:23:08 2013 +0000
    16.2 +++ b/maxima/receipt	Thu Dec 05 20:42:36 2013 +0000
    16.3 @@ -21,7 +21,7 @@
    16.4  		--localstatedir=/var \
    16.5  	$CONFIGURE_ARGS &&
    16.6  	make -j 1 && make -j 1 check &&
    16.7 -	make DESTDIR=$PWD/_pkg install
    16.8 +	make DESTDIR=$DESTDIR install
    16.9  }
   16.10  
   16.11  # Rules to gen a SliTaz package suitable for Tazpkg.   
    17.1 --- a/openvas-libraries/receipt	Thu Dec 05 20:23:08 2013 +0000
    17.2 +++ b/openvas-libraries/receipt	Thu Dec 05 20:42:36 2013 +0000
    17.3 @@ -21,7 +21,7 @@
    17.4  	--mandir=/usr/share/man \
    17.5  	$CONFIGURE_ARGS &&
    17.6  	make &&
    17.7 -	make DESTDIR=$PWD/_pkg install
    17.8 +	make DESTDIR=$DESTDIR install
    17.9  }
   17.10  
   17.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    18.1 --- a/qjackctl/receipt	Thu Dec 05 20:23:08 2013 +0000
    18.2 +++ b/qjackctl/receipt	Thu Dec 05 20:42:36 2013 +0000
    18.3 @@ -25,7 +25,7 @@
    18.4  	#sed -i 's|^LIBS.*|& -Wl,--copy-dt-needed-entries -lX11|' qjackctl.pro.in
    18.5  	./configure $CONFIGURE_ARGS &&
    18.6  	make &&
    18.7 -	make DESTDIR=$PWD/_pkg install
    18.8 +	make DESTDIR=$DESTDIR install
    18.9  }
   18.10  
   18.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    19.1 --- a/sonata/receipt	Thu Dec 05 20:23:08 2013 +0000
    19.2 +++ b/sonata/receipt	Thu Dec 05 20:42:36 2013 +0000
    19.3 @@ -18,7 +18,7 @@
    19.4  compile_rules()
    19.5  {
    19.6  	cd $src
    19.7 -	python setup.py install --prefix=/usr --root="$PWD/_pkg" 	
    19.8 +	python setup.py install --prefix=/usr --root="$DESTDIR" 	
    19.9  }
   19.10  
   19.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    20.1 --- a/visualnqc/receipt	Thu Dec 05 20:23:08 2013 +0000
    20.2 +++ b/visualnqc/receipt	Thu Dec 05 20:42:36 2013 +0000
    20.3 @@ -17,8 +17,8 @@
    20.4  compile_rules()
    20.5  {
    20.6  	cd $src
    20.7 -	mkdir -p $src/_pkg
    20.8 -	cp -a $src/usr $src/_pkg
    20.9 +	mkdir -p $DESTDIR
   20.10 +	cp -a $src/usr $DESTDIR
   20.11  }
   20.12  
   20.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    21.1 --- a/xalan-xerces-j/receipt	Thu Dec 05 20:23:08 2013 +0000
    21.2 +++ b/xalan-xerces-j/receipt	Thu Dec 05 20:42:36 2013 +0000
    21.3 @@ -21,8 +21,8 @@
    21.4  	[ -d ${SOURCE}_2_7_1 ] && mv ${SOURCE}_2_7_1  $src
    21.5  	cd $src
    21.6  	
    21.7 -	mkdir -p $src/_pkg/usr/share/java &&
    21.8 -	cp -f $src/*.jar $src/_pkg/usr/share/java
    21.9 +	mkdir -p $DESTDIR/usr/share/java &&
   21.10 +	cp -f $src/*.jar $DESTDIR/usr/share/java
   21.11  }
   21.12  
   21.13  # Rules to gen a SliTaz package suitable for Tazpkg.