# HG changeset patch
# User Matthew Sheets <rcx@zoominternet.net>
# Date 1248356032 0
# Node ID 9c0f256e44ac299df77a975f1c71720f0790d07f
# Parent  303e30733e97f830c440078ac67160d67a831d43
Update: attr (build)

diff -r 303e30733e97 -r 9c0f256e44ac attr-dev/receipt
--- a/attr-dev/receipt	Thu Jul 23 12:38:22 2009 +0000
+++ b/attr-dev/receipt	Thu Jul 23 13:33:52 2009 +0000
@@ -12,10 +12,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib
 	mkdir -p $fs/usr/lib
-	cp -a $_pkg/lib/*.*a $fs/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-	
+
+	mkdir -p $fs/usr/libexec
+	cp -a $_pkg/usr/libexec/*.*a $fs/usr/libexec
+
 	cp -a $_pkg/usr/include $fs/usr
 }
diff -r 303e30733e97 -r 9c0f256e44ac attr/receipt
--- a/attr/receipt	Thu Jul 23 12:38:22 2009 +0000
+++ b/attr/receipt	Thu Jul 23 13:33:52 2009 +0000
@@ -17,11 +17,6 @@
 	mv $PACKAGE-2.4.43 $PACKAGE-$VERSION
 
 	cd $src
-	
-	# Patch commands are from http://minimalinux.org/forum/viewtopic.php?pid=1446#p1446
-	
-	# Backup install script
-	cp -f install-sh install-sh.orig
 
 	# these sed lines replace the patch "attr.destdir.diff" from the Slackware source files
 	sed -i s%"@bindir@"%"\$\(DESTDIR\)@bindir@"% include/builddefs.in
@@ -32,27 +27,28 @@
 	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@/doc/@pkg_name@"%"\$\(DESTDIR\)/usr/doc/@pkg_name@-\$\(VERSION\)"% include/builddefs.in
 	sed -i s%"@datadir@/locale"%"\$\(DESTDIR\)@datadir@/locale"% include/builddefs.in
-	
-	# Restore install script
-	cp -f install-sh.orig install.sh
-	
+
 	# Don't need to build man and doc
 	rm -r -f man
 	rm -r -f doc
-	
-	make LOCAL_CONFIGURE_OPTIONS="$CONFIGURE_ARGS" &&
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
 	make DESTDIR=$src/_pkg install install-lib install-dev
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib
 	mkdir -p $fs/usr/lib
-	cp -a $_pkg/lib/*.so* $fs/lib
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	
+	mkdir -p $fs/usr/libexec
+	cp -a $_pkg/usr/libexec/*.so* $fs/usr/libexec
+	
 	cp -a $_pkg/usr/bin $fs/usr
 }