# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1299340169 -3600
# Node ID 2c7359247d61cf25b24727c394b27f6a92d0794d
# Parent  c3a511cabf2b87c4763da478ee2940d50731dd7b
cndrvcups-common: fix genpkg_rules

diff -r c3a511cabf2b -r 2c7359247d61 cndrvcups-common-dev/receipt
--- a/cndrvcups-common-dev/receipt	Sat Mar 05 13:36:09 2011 +0100
+++ b/cndrvcups-common-dev/receipt	Sat Mar 05 16:49:29 2011 +0100
@@ -12,8 +12,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	_pkg="$WOK/$WANTED/$SOURCE/Sources/cndrvcups-common-$VERSION"
-	cp -a $_pkg/buftool/_pkg/usr/include $fs/usr
-	cp -a $_pkg/buftool/_pkg/usr/lib $fs/usr	
+	mkdir -p $fs/usr/lib
+	cp -a $_pkg/usr/include $fs/usr
+	cp -a $_pkg/usr/lib/*.a $fs/usr/lib
 }
diff -r c3a511cabf2b -r 2c7359247d61 cndrvcups-common/receipt
--- a/cndrvcups-common/receipt	Sat Mar 05 13:36:09 2011 +0100
+++ b/cndrvcups-common/receipt	Sat Mar 05 16:49:29 2011 +0100
@@ -17,9 +17,9 @@
 
 compile_rules() {
 	
-    cd $src/Sources
+    cd $src
    
-    [ -d cndrvcups-common-$VERSION ] || tar xzf cndrvcups-common-${VERSION}-1.tar.gz
+    [ -d cndrvcups-common-$VERSION ] || tar xzf Sources/cndrvcups-common-${VERSION}-1.tar.gz
     
     cd $src/cndrvcups-common-$VERSION/buftool 
     ./autogen.sh --prefix=/usr && 
@@ -29,7 +29,7 @@
     cd $src/cndrvcups-common-$VERSION/cpca 
     ./autogen.sh --prefix=/usr && 
     make && 
-    make DESTDIR=$DESTDIR LIBDIR=$PWD/_pkg/usr/lib install
+    make DESTDIR=$DESTDIR LIBDIR=$DESTDIR/usr/lib install
       
     cd $src/cndrvcups-common-$VERSION/cngplp 
     ./autogen.sh --prefix=/usr && 
@@ -37,8 +37,9 @@
     make DESTDIR=$DESTDIR install
   
     cd $src/cndrvcups-common-$VERSION/c3plmod_ipc 
-    make && cp -a $src/Sources $DESTDIR
+    make && cp -a $src/cndrvcups-common-$VERSION $DESTDIR
 }
+cp: can't stat '/home/slitaz/cooking/wok/cndrvcups-common/install/cndrvcups-common-1.80/cpca/_pkg/usr/lib/*.so*': No such file or directory
 	
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -52,9 +53,9 @@
 	cp -a $_pkg/cndrvcups-common-$VERSION/libs/*.so* $fs/usr/lib
 	cp -a $_pkg/cndrvcups-common-$VERSION/libs/cnpkmodule $fs/usr/bin/
 	cp -a $_pkg/cndrvcups-common-$VERSION/libs/c3pldrv $fs/usr/bin/
-	cp -a $_pkg/cndrvcups-common-$VERSION/cpca/_pkg/usr/lib/*.so* $fs/usr/lib
-	cp -a $_pkg/cndrvcups-common-$VERSION/cngplp/_pkg/etc $fs
-	cp -a $_pkg/cndrvcups-common-$VERSION/cngplp/_pkg/usr $fs	
+	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
+	cp -a $_pkg/etc $fs
+	cp -a $_pkg/usr $fs	
 	cp -a $_pkg/cndrvcups-common-$VERSION/c3plmod_ipc/libcanonc3pl.so.1.0.0 $fs/usr/lib 
 	cp -a $_pkg/cndrvcups-common-$VERSION/data/C*   $fs/usr/share/caepcm