# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1252007160 -7200
# Node ID 05b5a901936b0e4ffcfc68ef9cd309032bb6f21c
# Parent  3ecbb6f5aa64a57d28485aec018d91c2bb88fcbb
mingw32*: fix FSH

diff -r 3ecbb6f5aa64 -r 05b5a901936b mingw32-binutils/receipt
--- a/mingw32-binutils/receipt	Thu Sep 03 21:23:46 2009 +0200
+++ b/mingw32-binutils/receipt	Thu Sep 03 21:46:00 2009 +0200
@@ -21,7 +21,7 @@
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		--with-sysroot=/usr/$MINGW32_TARGET \
+		--with-sysroot=/usr/lib/$MINGW32_TARGET \
 		--disable-shared \
 		--disable-debug \
 		--target=$MINGW32_TARGET \
@@ -33,11 +33,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
+	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/$MINGW32_TARGET $fs/usr
+	cp -a $_pkg/usr/lib/$MINGW32_TARGET $fs/usr/lib
 	# do not need to copy lib/libiberty.a
 	
 	#Create a symlink for --with-sysroot
-	( cd $fs/usr/$MINGW32_TARGET && ln -s . usr )
+	( cd $fs/usr/lib/$MINGW32_TARGET && ln -s . usr )
 }
diff -r 3ecbb6f5aa64 -r 05b5a901936b mingw32-gcc-c/receipt
--- a/mingw32-gcc-c/receipt	Thu Sep 03 21:23:46 2009 +0200
+++ b/mingw32-gcc-c/receipt	Thu Sep 03 21:46:00 2009 +0200
@@ -22,6 +22,7 @@
 	cd $SOURCE-$VERSION-build
 	$src/configure \
 		--prefix=/usr \
+		--libexecdir=/usr/lib \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--with-sysroot=/usr/$MINGW32_TARGET \
@@ -46,7 +47,6 @@
 	# do not need to copy lib/libiberty.a
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/gcc $fs/usr/lib
-	cp -a $_pkg/usr/libexec $fs/usr
 }
 
 # Rules to setup after installation
diff -r 3ecbb6f5aa64 -r 05b5a901936b mingw32-gcc/receipt
--- a/mingw32-gcc/receipt	Thu Sep 03 21:23:46 2009 +0200
+++ b/mingw32-gcc/receipt	Thu Sep 03 21:46:00 2009 +0200
@@ -48,9 +48,10 @@
 	cd $SOURCE-$VERSION-build
 	$src/configure \
 		--prefix=/usr \
+		--libexecdir=/usr/lib \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		--with-sysroot=/usr/$MINGW32_TARGET \
+		--with-sysroot=/usr/lib/$MINGW32_TARGET \
 		--disable-shared \
 		--disable-debug \
 		--target=$MINGW32_TARGET \
@@ -66,14 +67,13 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
+	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/$MINGW32_TARGET $fs/usr
+	cp -a $_pkg/usr/lib/$MINGW32_TARGET $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 	# do not need to copy lib/libiberty.a
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/gcc $fs/usr/lib
-	cp -a $_pkg/usr/libexec $fs/usr
 }
 
 # Rules to setup after installation
@@ -83,7 +83,7 @@
 	local root
 	root=$1
 	find $root/usr/lib/gcc/$MINGW32_TARGET/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
-	find $root/usr/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
+	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
 }
 
 # Rules to clean the package
diff -r 3ecbb6f5aa64 -r 05b5a901936b mingw32-runtime-headers/receipt
--- a/mingw32-runtime-headers/receipt	Thu Sep 03 21:23:46 2009 +0200
+++ b/mingw32-runtime-headers/receipt	Thu Sep 03 21:46:00 2009 +0200
@@ -18,8 +18,8 @@
 {
 	cd $src
 	
-	mkdir -p _pkg/usr/$MINGW32_TARGET
-	cp -a include _pkg/usr/$MINGW32_TARGET
+	mkdir -p _pkg/usr/lib/$MINGW32_TARGET
+	cp -a include _pkg/usr/lib/$MINGW32_TARGET
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 3ecbb6f5aa64 -r 05b5a901936b mingw32-runtime/receipt
--- a/mingw32-runtime/receipt	Thu Sep 03 21:23:46 2009 +0200
+++ b/mingw32-runtime/receipt	Thu Sep 03 21:46:00 2009 +0200
@@ -37,10 +37,10 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/$MINGW32_TARGET
-	cp -a $_pkg/usr/bin $fs/usr/$MINGW32_TARGET
-	cp -a $_pkg/usr/include $fs/usr/$MINGW32_TARGET
-	cp -a $_pkg/usr/lib $fs/usr/$MINGW32_TARGET
+	mkdir -p $fs/usr/lib/$MINGW32_TARGET
+	cp -a $_pkg/usr/bin $fs/usr/lib/$MINGW32_TARGET
+	cp -a $_pkg/usr/include $fs/usr/lib/$MINGW32_TARGET
+	cp -a $_pkg/usr/lib $fs/usr/lib/$MINGW32_TARGET
 }
 
 # Rules to setup after installation
@@ -49,7 +49,7 @@
 	# Archives get stripped during packaging; need to run ranlib
 	local root
 	root=$1
-	find $root/usr/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
+	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
 }
 
 # Rules to clean the package
diff -r 3ecbb6f5aa64 -r 05b5a901936b mingw32-w32api-headers/receipt
--- a/mingw32-w32api-headers/receipt	Thu Sep 03 21:23:46 2009 +0200
+++ b/mingw32-w32api-headers/receipt	Thu Sep 03 21:46:00 2009 +0200
@@ -18,8 +18,8 @@
 {
 	cd $src
 	
-	mkdir -p _pkg/usr/$MINGW32_TARGET
-	cp -a include _pkg/usr/$MINGW32_TARGET
+	mkdir -p _pkg/usr/lib/$MINGW32_TARGET
+	cp -a include _pkg/usr/lib/$MINGW32_TARGET
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 3ecbb6f5aa64 -r 05b5a901936b mingw32-w32api/receipt
--- a/mingw32-w32api/receipt	Thu Sep 03 21:23:46 2009 +0200
+++ b/mingw32-w32api/receipt	Thu Sep 03 21:46:00 2009 +0200
@@ -37,8 +37,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/$MINGW32_TARGET
-	cp -a $_pkg/usr/lib $fs/usr/$MINGW32_TARGET
+	mkdir -p $fs/usr/lib/$MINGW32_TARGET
+	cp -a $_pkg/usr/lib $fs/usr/lib/$MINGW32_TARGET
 }
 
 # Rules to setup after installation
@@ -47,7 +47,7 @@
 	# Archives get stripped during packaging; need to run ranlib
 	local root
 	root=$1
-	find $root/usr/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
+	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
 }
 
 # Rules to clean the package