wok-4.x rev 3744

Update: attr (build)
author Matthew Sheets <rcx@zoominternet.net>
date Thu Jul 23 13:33:52 2009 +0000 (2009-07-23)
parents 303e30733e97
children 3a9a515bf97c
files attr-dev/receipt attr/receipt
line diff
     1.1 --- a/attr-dev/receipt	Thu Jul 23 12:38:22 2009 +0000
     1.2 +++ b/attr-dev/receipt	Thu Jul 23 13:33:52 2009 +0000
     1.3 @@ -12,10 +12,11 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  genpkg_rules()
     1.6  {
     1.7 -	mkdir -p $fs/lib
     1.8  	mkdir -p $fs/usr/lib
     1.9 -	cp -a $_pkg/lib/*.*a $fs/lib
    1.10  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    1.11 -	
    1.12 +
    1.13 +	mkdir -p $fs/usr/libexec
    1.14 +	cp -a $_pkg/usr/libexec/*.*a $fs/usr/libexec
    1.15 +
    1.16  	cp -a $_pkg/usr/include $fs/usr
    1.17  }
     2.1 --- a/attr/receipt	Thu Jul 23 12:38:22 2009 +0000
     2.2 +++ b/attr/receipt	Thu Jul 23 13:33:52 2009 +0000
     2.3 @@ -17,11 +17,6 @@
     2.4  	mv $PACKAGE-2.4.43 $PACKAGE-$VERSION
     2.5  
     2.6  	cd $src
     2.7 -	
     2.8 -	# Patch commands are from http://minimalinux.org/forum/viewtopic.php?pid=1446#p1446
     2.9 -	
    2.10 -	# Backup install script
    2.11 -	cp -f install-sh install-sh.orig
    2.12  
    2.13  	# these sed lines replace the patch "attr.destdir.diff" from the Slackware source files
    2.14  	sed -i s%"@bindir@"%"\$\(DESTDIR\)@bindir@"% include/builddefs.in
    2.15 @@ -32,27 +27,28 @@
    2.16  	sed -i s%"@mandir@"%"\$\(DESTDIR\)@mandir@"% include/builddefs.in
    2.17  	
    2.18  	# force docdir conformance to Slack default
    2.19 -	#sed -i s%"@datadir@/doc/@pkg_name@"%"\$\(DESTDIR\)/usr/doc/@pkg_name@-\$\(VERSION\)"% include/builddefs.in
    2.20 +	sed -i s%"@datadir@/doc/@pkg_name@"%"\$\(DESTDIR\)/usr/doc/@pkg_name@-\$\(VERSION\)"% include/builddefs.in
    2.21  	sed -i s%"@datadir@/locale"%"\$\(DESTDIR\)@datadir@/locale"% include/builddefs.in
    2.22 -	
    2.23 -	# Restore install script
    2.24 -	cp -f install-sh.orig install.sh
    2.25 -	
    2.26 +
    2.27  	# Don't need to build man and doc
    2.28  	rm -r -f man
    2.29  	rm -r -f doc
    2.30 -	
    2.31 -	make LOCAL_CONFIGURE_OPTIONS="$CONFIGURE_ARGS" &&
    2.32 +
    2.33 +	./configure \
    2.34 +		--prefix=/usr \
    2.35 +		$CONFIGURE_ARGS &&
    2.36 +	make &&
    2.37  	make DESTDIR=$src/_pkg install install-lib install-dev
    2.38  }
    2.39  
    2.40  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.41  genpkg_rules()
    2.42  {
    2.43 -	mkdir -p $fs/lib
    2.44  	mkdir -p $fs/usr/lib
    2.45 -	cp -a $_pkg/lib/*.so* $fs/lib
    2.46  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    2.47  	
    2.48 +	mkdir -p $fs/usr/libexec
    2.49 +	cp -a $_pkg/usr/libexec/*.so* $fs/usr/libexec
    2.50 +	
    2.51  	cp -a $_pkg/usr/bin $fs/usr
    2.52  }