wok-4.x rev 8050

Improve attr&acl receipts by replacing strange slackware seds by the use of DIST_ROOT; acl includes are now going at the right place.
author Antoine Bodin <gokhlayeh@slitaz.org>
date Thu Jan 20 21:38:00 2011 +0100 (2011-01-20)
parents f1b0a76316ff
children 8f8fa9cea931
files acl-dev/receipt acl/receipt attr-dev/receipt attr/receipt
line diff
     1.1 --- a/acl-dev/receipt	Thu Jan 20 14:57:40 2011 +0000
     1.2 +++ b/acl-dev/receipt	Thu Jan 20 21:38:00 2011 +0100
     1.3 @@ -12,16 +12,8 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  genpkg_rules()
     1.6  {
     1.7 -	mkdir -p $fs/usr/lib $fs/usr/include
     1.8 +	mkdir -p $fs/usr/lib $fs/usr/include $fs/lib
     1.9  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    1.10 -
    1.11 -	# Symlinks are not created correctly; create manually
    1.12 -	mkdir -p $fs/lib
    1.13 -	ln -s /usr/lib/libacl.a $fs/lib/libacl.a
    1.14 -	ln -s /usr/lib/libacl.la $fs/lib/libacl.la
    1.15 -
    1.16 -	cp -a $src/include/*acl*.h $fs/usr/include
    1.17 -
    1.18 -	mkdir -p $fs/usr/include/sys
    1.19 -	ln -s /usr/include/acl.h $fs/usr/include/sys/acl.h
    1.20 +	cp -a $_pkg/lib/*.*a $fs/lib
    1.21 +	cp -a $_pkg/usr/include/* $fs/usr/include
    1.22  }
     2.1 --- a/acl/receipt	Thu Jan 20 14:57:40 2011 +0000
     2.2 +++ b/acl/receipt	Thu Jan 20 21:38:00 2011 +0100
     2.3 @@ -16,31 +16,13 @@
     2.4  {
     2.5  	cd $src
     2.6  
     2.7 -	# Patch commands are from http://minimalinux.org/forum/viewtopic.php?pid=1446#p1446
     2.8 -
     2.9 -	# these sed lines replace the patch "attr.destdir.diff" from the Slackware source files
    2.10 -	sed -i s%"@bindir@"%"\$\(DESTDIR\)@bindir@"% include/builddefs.in
    2.11 -	sed -i s%"@sbindir@"%"\$\(DESTDIR\)@sbindir@"% include/builddefs.in
    2.12 -	sed -i s%"@libdir@@libdirsuffix@"%"\$\(DESTDIR\)@libdir@@libdirsuffix@"% include/builddefs.in
    2.13 -	sed -i s%"@libexecdir@@libdirsuffix@"%"\$\(DESTDIR\)@libexecdir@@libdirsuffix@"% include/builddefs.in
    2.14 -	sed -i s%"@includedir@/attr"%"\$\(DESTDIR\)@includedir@/attr"% include/builddefs.in
    2.15 -	sed -i s%"@mandir@"%"\$\(DESTDIR\)@mandir@"% include/builddefs.in
    2.16 -	
    2.17 -	# force docdir conformance to Slack default
    2.18 -	sed -i s%"@datadir@/doc/@pkg_name@"%"\$\(DESTDIR\)/usr/doc/@pkg_name@-\$\(VERSION\)"% include/builddefs.in
    2.19 -	sed -i s%"@datadir@/locale"%"\$\(DESTDIR\)@datadir@/locale"% include/builddefs.in
    2.20 -
    2.21 -	# Don't need to build man and doc
    2.22 -	# rm -r -f man
    2.23 -	# rm -r -f doc
    2.24 -
    2.25  	# Need bash sh to compile
    2.26  	mv /bin/sh /bin/sh.bak
    2.27  	ln -s /bin/bash /bin/sh
    2.28  
    2.29  	# Configure is included in Makefile
    2.30  	{ make LOCAL_CONFIGURE_OPTIONS="$CONFIGURE_ARGS" &&
    2.31 -	make install install-lib install-dev DESTDIR=$PWD/_pkg
    2.32 +	make install install-lib install-dev DIST_ROOT=$PWD/_pkg
    2.33  	} || { mv -f /bin/sh.bak /bin/sh; return 1; }
    2.34  
    2.35  	mv -f /bin/sh.bak /bin/sh
    2.36 @@ -49,12 +31,8 @@
    2.37  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.38  genpkg_rules()
    2.39  {
    2.40 -	mkdir -p $fs/lib
    2.41 +	mkdir -p $fs/lib $fs/usr/lib
    2.42  	cp -a $_pkg/lib/*.so* $fs/lib
    2.43 -
    2.44 -	# Symlinks are not created correctly; create manually
    2.45 -	mkdir -p $fs/usr/lib
    2.46 -	ln -s /lib/libacl.so $fs/usr/lib/libacl.so
    2.47 -
    2.48 +	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    2.49  	cp -a $_pkg/usr/bin $fs/usr
    2.50  }
     3.1 --- a/attr-dev/receipt	Thu Jan 20 14:57:40 2011 +0000
     3.2 +++ b/attr-dev/receipt	Thu Jan 20 21:38:00 2011 +0100
     3.3 @@ -12,13 +12,8 @@
     3.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     3.5  genpkg_rules()
     3.6  {
     3.7 -	mkdir -p $fs/usr/lib
     3.8 +	mkdir -p $fs/usr/lib $fs/lib
     3.9  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    3.10 -
    3.11 -	# Symlinks are not created correctly; create manually
    3.12 -	mkdir -p $fs/lib
    3.13 -	ln -s /usr/lib/libattr.a $fs/lib/libattr.a
    3.14 -	ln -s /usr/lib/libattr.la $fs/lib/libattr.la
    3.15 -
    3.16 +	cp -a $_pkg/lib/*.*a $fs/lib
    3.17  	cp -a $_pkg/usr/include $fs/usr
    3.18  }
     4.1 --- a/attr/receipt	Thu Jan 20 14:57:40 2011 +0000
     4.2 +++ b/attr/receipt	Thu Jan 20 21:38:00 2011 +0100
     4.3 @@ -16,31 +16,13 @@
     4.4  {
     4.5  	cd $src
     4.6  
     4.7 -	# Patch commands are from http://minimalinux.org/forum/viewtopic.php?pid=1446#p1446
     4.8 -
     4.9 -	# these sed lines replace the patch "attr.destdir.diff" from the Slackware source files
    4.10 -	sed -i s%"@bindir@"%"\$\(DESTDIR\)@bindir@"% include/builddefs.in
    4.11 -	sed -i s%"@sbindir@"%"\$\(DESTDIR\)@sbindir@"% include/builddefs.in
    4.12 -	sed -i s%"@libdir@@libdirsuffix@"%"\$\(DESTDIR\)@libdir@@libdirsuffix@"% include/builddefs.in
    4.13 -	sed -i s%"@libexecdir@@libdirsuffix@"%"\$\(DESTDIR\)@libexecdir@@libdirsuffix@"% include/builddefs.in
    4.14 -	sed -i s%"@includedir@/attr"%"\$\(DESTDIR\)@includedir@/attr"% include/builddefs.in
    4.15 -	sed -i s%"@mandir@"%"\$\(DESTDIR\)@mandir@"% include/builddefs.in
    4.16 -	
    4.17 -	# force docdir conformance to Slack default
    4.18 -	sed -i s%"@datadir@/doc/@pkg_name@"%"\$\(DESTDIR\)/usr/doc/@pkg_name@-\$\(VERSION\)"% include/builddefs.in
    4.19 -	sed -i s%"@datadir@/locale"%"\$\(DESTDIR\)@datadir@/locale"% include/builddefs.in
    4.20 -
    4.21 -	# Don't need to build man and doc
    4.22 -	# rm -r -f man
    4.23 -	# rm -r -f doc
    4.24 -
    4.25  	# Need bash sh to compile
    4.26  	mv /bin/sh /bin/sh.bak
    4.27  	ln -s /bin/bash /bin/sh
    4.28  
    4.29  	# Configure is included in Makefile
    4.30  	{ make LOCAL_CONFIGURE_OPTIONS="$CONFIGURE_ARGS" &&
    4.31 -	make install install-lib install-dev DESTDIR=$PWD/_pkg
    4.32 +	make install install-lib install-dev DIST_ROOT=$PWD/_pkg
    4.33  	} || { mv -f /bin/sh.bak /bin/sh; return 1; }
    4.34  
    4.35  	mv -f /bin/sh.bak /bin/sh
    4.36 @@ -49,12 +31,8 @@
    4.37  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.38  genpkg_rules()
    4.39  {
    4.40 -	mkdir -p $fs/lib
    4.41 +	mkdir -p $fs/lib $fs/usr/lib
    4.42  	cp -a $_pkg/lib/*.so* $fs/lib
    4.43 -
    4.44 -	# Symlinks are not created correctly; create manually
    4.45 -	mkdir -p $fs/usr/lib
    4.46 -	ln -s /lib/libattr.so $fs/usr/lib/libattr.so
    4.47 -
    4.48 +	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    4.49  	cp -a $_pkg/usr/bin $fs/usr
    4.50  }