# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1295555880 -3600
# Node ID cd2506f67c2e878edfeb54eff67d38210c049506
# Parent  f1b0a76316ff7f4a702a38e3a95b1defa1c46d58
Improve attr&acl receipts by replacing strange slackware seds by the use of DIST_ROOT; acl includes are now going at the right place.

diff -r f1b0a76316ff -r cd2506f67c2e acl-dev/receipt
--- a/acl-dev/receipt	Thu Jan 20 14:57:40 2011 +0000
+++ b/acl-dev/receipt	Thu Jan 20 21:38:00 2011 +0100
@@ -12,16 +12,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/usr/include
+	mkdir -p $fs/usr/lib $fs/usr/include $fs/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-
-	# Symlinks are not created correctly; create manually
-	mkdir -p $fs/lib
-	ln -s /usr/lib/libacl.a $fs/lib/libacl.a
-	ln -s /usr/lib/libacl.la $fs/lib/libacl.la
-
-	cp -a $src/include/*acl*.h $fs/usr/include
-
-	mkdir -p $fs/usr/include/sys
-	ln -s /usr/include/acl.h $fs/usr/include/sys/acl.h
+	cp -a $_pkg/lib/*.*a $fs/lib
+	cp -a $_pkg/usr/include/* $fs/usr/include
 }
diff -r f1b0a76316ff -r cd2506f67c2e acl/receipt
--- a/acl/receipt	Thu Jan 20 14:57:40 2011 +0000
+++ b/acl/receipt	Thu Jan 20 21:38:00 2011 +0100
@@ -16,31 +16,13 @@
 {
 	cd $src
 
-	# Patch commands are from http://minimalinux.org/forum/viewtopic.php?pid=1446#p1446
-
-	# these sed lines replace the patch "attr.destdir.diff" from the Slackware source files
-	sed -i s%"@bindir@"%"\$\(DESTDIR\)@bindir@"% include/builddefs.in
-	sed -i s%"@sbindir@"%"\$\(DESTDIR\)@sbindir@"% include/builddefs.in
-	sed -i s%"@libdir@@libdirsuffix@"%"\$\(DESTDIR\)@libdir@@libdirsuffix@"% include/builddefs.in
-	sed -i s%"@libexecdir@@libdirsuffix@"%"\$\(DESTDIR\)@libexecdir@@libdirsuffix@"% include/builddefs.in
-	sed -i s%"@includedir@/attr"%"\$\(DESTDIR\)@includedir@/attr"% include/builddefs.in
-	sed -i s%"@mandir@"%"\$\(DESTDIR\)@mandir@"% include/builddefs.in
-	
-	# force docdir conformance to Slack default
-	sed -i s%"@datadir@/doc/@pkg_name@"%"\$\(DESTDIR\)/usr/doc/@pkg_name@-\$\(VERSION\)"% include/builddefs.in
-	sed -i s%"@datadir@/locale"%"\$\(DESTDIR\)@datadir@/locale"% include/builddefs.in
-
-	# Don't need to build man and doc
-	# rm -r -f man
-	# rm -r -f doc
-
 	# Need bash sh to compile
 	mv /bin/sh /bin/sh.bak
 	ln -s /bin/bash /bin/sh
 
 	# Configure is included in Makefile
 	{ make LOCAL_CONFIGURE_OPTIONS="$CONFIGURE_ARGS" &&
-	make install install-lib install-dev DESTDIR=$PWD/_pkg
+	make install install-lib install-dev DIST_ROOT=$PWD/_pkg
 	} || { mv -f /bin/sh.bak /bin/sh; return 1; }
 
 	mv -f /bin/sh.bak /bin/sh
@@ -49,12 +31,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib
+	mkdir -p $fs/lib $fs/usr/lib
 	cp -a $_pkg/lib/*.so* $fs/lib
-
-	# Symlinks are not created correctly; create manually
-	mkdir -p $fs/usr/lib
-	ln -s /lib/libacl.so $fs/usr/lib/libacl.so
-
+	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	cp -a $_pkg/usr/bin $fs/usr
 }
diff -r f1b0a76316ff -r cd2506f67c2e attr-dev/receipt
--- a/attr-dev/receipt	Thu Jan 20 14:57:40 2011 +0000
+++ b/attr-dev/receipt	Thu Jan 20 21:38:00 2011 +0100
@@ -12,13 +12,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
+	mkdir -p $fs/usr/lib $fs/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-
-	# Symlinks are not created correctly; create manually
-	mkdir -p $fs/lib
-	ln -s /usr/lib/libattr.a $fs/lib/libattr.a
-	ln -s /usr/lib/libattr.la $fs/lib/libattr.la
-
+	cp -a $_pkg/lib/*.*a $fs/lib
 	cp -a $_pkg/usr/include $fs/usr
 }
diff -r f1b0a76316ff -r cd2506f67c2e attr/receipt
--- a/attr/receipt	Thu Jan 20 14:57:40 2011 +0000
+++ b/attr/receipt	Thu Jan 20 21:38:00 2011 +0100
@@ -16,31 +16,13 @@
 {
 	cd $src
 
-	# Patch commands are from http://minimalinux.org/forum/viewtopic.php?pid=1446#p1446
-
-	# these sed lines replace the patch "attr.destdir.diff" from the Slackware source files
-	sed -i s%"@bindir@"%"\$\(DESTDIR\)@bindir@"% include/builddefs.in
-	sed -i s%"@sbindir@"%"\$\(DESTDIR\)@sbindir@"% include/builddefs.in
-	sed -i s%"@libdir@@libdirsuffix@"%"\$\(DESTDIR\)@libdir@@libdirsuffix@"% include/builddefs.in
-	sed -i s%"@libexecdir@@libdirsuffix@"%"\$\(DESTDIR\)@libexecdir@@libdirsuffix@"% include/builddefs.in
-	sed -i s%"@includedir@/attr"%"\$\(DESTDIR\)@includedir@/attr"% include/builddefs.in
-	sed -i s%"@mandir@"%"\$\(DESTDIR\)@mandir@"% include/builddefs.in
-	
-	# force docdir conformance to Slack default
-	sed -i s%"@datadir@/doc/@pkg_name@"%"\$\(DESTDIR\)/usr/doc/@pkg_name@-\$\(VERSION\)"% include/builddefs.in
-	sed -i s%"@datadir@/locale"%"\$\(DESTDIR\)@datadir@/locale"% include/builddefs.in
-
-	# Don't need to build man and doc
-	# rm -r -f man
-	# rm -r -f doc
-
 	# Need bash sh to compile
 	mv /bin/sh /bin/sh.bak
 	ln -s /bin/bash /bin/sh
 
 	# Configure is included in Makefile
 	{ make LOCAL_CONFIGURE_OPTIONS="$CONFIGURE_ARGS" &&
-	make install install-lib install-dev DESTDIR=$PWD/_pkg
+	make install install-lib install-dev DIST_ROOT=$PWD/_pkg
 	} || { mv -f /bin/sh.bak /bin/sh; return 1; }
 
 	mv -f /bin/sh.bak /bin/sh
@@ -49,12 +31,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib
+	mkdir -p $fs/lib $fs/usr/lib
 	cp -a $_pkg/lib/*.so* $fs/lib
-
-	# Symlinks are not created correctly; create manually
-	mkdir -p $fs/usr/lib
-	ln -s /lib/libattr.so $fs/usr/lib/libattr.so
-
+	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	cp -a $_pkg/usr/bin $fs/usr
 }