cookutils rev 362

cross: make sure we have glibc-prts for arm
author Christophe Lincoln <pankso@slitaz.org>
date Wed May 09 22:33:50 2012 +0200 (2012-05-09)
parents e7e7979eb49d
children 1f0ff5d5fdd8
files Makefile cross
line diff
     1.1 --- a/Makefile	Wed May 09 22:15:39 2012 +0200
     1.2 +++ b/Makefile	Wed May 09 22:33:50 2012 +0200
     1.3 @@ -8,23 +8,26 @@
     1.4  
     1.5  install:
     1.6  	install -m 0755 -d $(DESTDIR)/etc/slitaz
     1.7 -	install -m 0755-d $(DESTDIR)$(PREFIX)/bin
     1.8 -	install -m 0755 -d $(DESTDIR)/var/www/cooker
     1.9 +	install -m 0755 -d $(DESTDIR)/etc/init.d
    1.10 +	install -m 0755 -d $(DESTDIR)$(PREFIX)/bin
    1.11 +	install -m 0755 -d $(DESTDIR)/var/www/cgi-bin/cooker
    1.12  	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/applications
    1.13 -	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/cook
    1.14 +	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/cook/cooktest
    1.15  	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/doc/cookutils
    1.16  	install -m 0755 cook $(DESTDIR)$(PREFIX)/bin
    1.17  	install -m 0755 cooker $(DESTDIR)$(PREFIX)/bin
    1.18  	install -m 0755 cookiso $(DESTDIR)$(PREFIX)/bin
    1.19  	install -m 0644 cook.conf $(DESTDIR)/etc/slitaz
    1.20  	install -m 0644 cook.site $(DESTDIR)/etc/slitaz
    1.21 -	install -m 0644 web/* $(DESTDIR)/var/www/cooker
    1.22 -	cp -r data/*.desktop $(DESTDIR)$(PREFIX)/share/applications
    1.23 -	cp -r data/* $(DESTDIR)$(PREFIX)/share/cook
    1.24 -	rm $(DESTDIR)$(PREFIX)/share/cook/*.desktop
    1.25 -	cp -r doc/* $(DESTDIR)$(PREFIX)/share/doc/cookutils
    1.26 -	cp -r README $(DESTDIR)$(PREFIX)/share/doc/cookutils
    1.27 -	cp -r init.d $(DESTDIR)/etc
    1.28 +	install -m 0644 web/* $(DESTDIR)/var/www/cgi-bin/cooker
    1.29 +	install -m 0644 data/*.desktop $(DESTDIR)$(PREFIX)/share/applications
    1.30 +	install -m 0644 data/cooklist $(DESTDIR)$(PREFIX)/share/cook
    1.31 +	install -m 0644 data/receipt $(DESTDIR)$(PREFIX)/share/cook
    1.32 +	install -m 0644 data/cooktest/* $(DESTDIR)$(PREFIX)/share/cook/cooktest
    1.33 +	install -m 0644 doc/* $(DESTDIR)$(PREFIX)/share/doc/cookutils
    1.34 +	install -m 0644 README $(DESTDIR)$(PREFIX)/share/doc/cookutils
    1.35 +	install -m 0755 init.d/cooker $(DESTDIR)/etc/init.d
    1.36 +	chmod 0755 $(DESTDIR)/var/www/cgi-bin/cooker/*.cgi
    1.37  
    1.38  uninstall:
    1.39  	rm -rf \
     2.1 --- a/cross	Wed May 09 22:15:39 2012 +0200
     2.2 +++ b/cross	Wed May 09 22:33:50 2012 +0200
     2.3 @@ -118,6 +118,9 @@
     2.4  	case $ARCH in
     2.5  		arm)
     2.6  			archopts=""
     2.7 +			[ -f "$SRC/glibc-ports-$GLIBC_VERSION.tar.bz2" ] || wget \
     2.8 +				http://ftp.gnu.org/gnu/libc/glibc-ports-$GLIBC_VERSION.tar.bz2 \
     2.9 +				-O $SRC/glibc-ports-$GLIBC_VERSION.tar.bz2 || exit 1
    2.10  			echo "Extracting: glibc-ports-$GLIBC_VERSION.tar.bz2"
    2.11  			rm -rf glibc-$GLIBC_VERSION/ports
    2.12  			tar xjf $SRC/glibc-ports-$GLIBC_VERSION.tar.bz2