SliTaz Repositories

     1.1 --- a/icedtea6-jdk/receipt	Fri May 27 00:58:14 2011 +0200
     1.2 +++ b/icedtea6-jdk/receipt	Fri May 27 01:21:23 2011 +0200
     1.3 @@ -81,34 +81,41 @@
     1.4  	# NOTE: don't build with -j 4. Only build with -j 1 or tank will crash
     1.5  	# NOTE: IcedTea6 does not define an "install" target
     1.6  	
     1.7 -	echo "Copying needed files to install dir"
     1.8 +	echo "Copying needed files to install dir..."
     1.9  	rm -rf $DESTDIR
    1.10  
    1.11  	local JVM_BUILDDIR
    1.12  	JVM_BUILDDIR=$src/openjdk.build/j2sdk-image
    1.13  	local JVM_DESTDIR
    1.14  	JVM_DESTDIR=${DESTDIR}$JVM_PREFIX
    1.15 +	echo "JVM_BUILDDIR: $JVM_BUILDDIR"
    1.16 +	echo "JVM_DESTDIR: $JVM_DESTDIR"
    1.17  
    1.18 +	echo "Copying files: bin/ lib/"
    1.19  	mkdir -p $JVM_DESTDIR
    1.20  	cp -a $JVM_BUILDDIR/bin $JVM_DESTDIR
    1.21  	cp -a $JVM_BUILDDIR/lib $JVM_DESTDIR
    1.22 -	
    1.23 +
    1.24 +	echo "Copying JRE files: bin/ lib/"
    1.25  	mkdir -p $JVM_DESTDIR/jre
    1.26  	cp -a $JVM_BUILDDIR/jre/bin $JVM_DESTDIR/jre
    1.27  	cp -a $JVM_BUILDDIR/jre/lib $JVM_DESTDIR/jre
    1.28  	
    1.29  	# Delete duplicated executables from the JDK bin
    1.30 +	echo "Deleting duplicated files..."
    1.31  	for jbin in $(ls -1 $JVM_DESTDIR/jre/bin) ; do
    1.32  		rm -f $JVM_DESTDIR/bin/$jbin
    1.33  	done
    1.34  
    1.35  	# Create symlinks for JDK binaries
    1.36 +	echo "Creating symlinks for JDK binaries..."
    1.37  	mkdir -p $DESTDIR/usr/jdk-bin
    1.38  	for jbin in $(ls -1 $JVM_DESTDIR/bin) ; do
    1.39  		ln -s $JVM_PREFIX/bin/$jbin $DESTDIR/usr/jdk-bin/$jbin
    1.40  	done
    1.41  	
    1.42  	# Create symlinks for JRE binaries
    1.43 +	echo "Creating symlinks for JRE binaries..."
    1.44  	mkdir -p $DESTDIR/usr/jre-bin
    1.45  	for jbin in $(ls -1 $JVM_DESTDIR/jre/bin) ; do
    1.46  		ln -s $JVM_PREFIX/jre/bin/$jbin $JVM_DESTDIR/bin/$jbin