tazbug rev 124

Fix Makefile
author Christophe Lincoln <pankso@slitaz.org>
date Tue Feb 21 01:13:01 2017 +0100 (2017-02-21)
parents 039c90c60494
children 1f5468a81629
files Makefile web/bugs.cgi
line diff
     1.1 --- a/Makefile	Tue Feb 21 00:51:31 2017 +0100
     1.2 +++ b/Makefile	Tue Feb 21 01:13:01 2017 +0100
     1.3 @@ -8,14 +8,15 @@
     1.4  VAR?=/var/lib/slitaz
     1.5  LINGUAS?=de el es fr ja pl pt_BR ru vi zh_CN
     1.6  
     1.7 -all:
     1.8 +all: msgfmt
     1.9  
    1.10  # i18n
    1.11  
    1.12  pot:
    1.13  	xgettext -o po/tazbug.pot -L Shell --package-name="SliTaz Bugs" \
    1.14  		./web/bugs.cgi 
    1.15 -		#./tazbug
    1.16 +	xgettext -o po/cli/tazbug-cli.pot -L Shell --package-name="SliTaz Bugs" \
    1.17 +		./tazbug
    1.18  
    1.19  msgmerge:
    1.20  	@for l in $(LINGUAS); do \
    1.21 @@ -33,26 +34,31 @@
    1.22  # Client install only. Server part is not packaged
    1.23  
    1.24  install:
    1.25 -	#install -m 0777 -d $(DESTDIR)$(PREFIX)/bin
    1.26 +	install -m 0777 -d $(DESTDIR)$(PREFIX)/bin
    1.27  	install -m 0777 -d $(DESTDIR)$(PREFIX)/share/applications
    1.28 -	#install -m 0755 tazbug $(DESTDIR)$(PREFIX)/bin
    1.29 +	install -m 0755 tazbug $(DESTDIR)$(PREFIX)/bin
    1.30  	install -m 0644 data/tazbug.desktop \
    1.31  		$(DESTDIR)$(PREFIX)/share/applications
    1.32  
    1.33 -# On SliTaz vhost: make install-server WEB=/home/slitaz/www
    1.34 +# On SliTaz vhost: make install-web WEB=/home/slitaz/www
    1.35  
    1.36 -install-server:
    1.37 -	install -m 0777 -d $(DESTDIR)/etc/slitaz
    1.38 +install-web:
    1.39  	install -m 0700 -d $(DESTDIR)$(VAR)/people
    1.40  	install -m 0700 -d $(DESTDIR)$(VAR)/auth
    1.41  	install -m 0777 -d $(DESTDIR)$(WEB)/bugs
    1.42 -	install -m 0644 tazbug.conf $(DESTDIR)/etc/slitaz
    1.43 +	# authfile
    1.44  	touch $(DESTDIR)$(VAR)/auth/people
    1.45  	chmod 0600 $(DESTDIR)$(VAR)/auth/people
    1.46 +	# admin users
    1.47 +	touch $(DESTDIR)$(VAR)/auth/admin
    1.48 +	chmod 0600 $(DESTDIR)$(VAR)/auth/people
    1.49  	cp -a web/* $(DESTDIR)$(WEB)/bugs
    1.50  	cp README $(DESTDIR)$(WEB)/bugs
    1.51  	chown -R www.www $(DESTDIR)$(VAR)/*
    1.52  	chown -R www.www $(DESTDIR)$(WEB)/bugs/bug
    1.53 +	# i18n
    1.54 +	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/locale
    1.55 +	cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale
    1.56  
    1.57  # Uninstall client
    1.58  
     2.1 --- a/web/bugs.cgi	Tue Feb 21 00:51:31 2017 +0100
     2.2 +++ b/web/bugs.cgi	Tue Feb 21 01:13:01 2017 +0100
     2.3 @@ -823,10 +823,10 @@
     2.4  
     2.5  <div id="tools">
     2.6  	$BUGS_TOOLS
     2.7 -	<a href="?closed">$(gettext 'View closed bugs')</a>
     2.8 +	<a href="?closed">$(gettext 'Closed bugs')</a>
     2.9  EOT
    2.10  		if check_auth; then
    2.11 -			echo "<a href='?newbug'>$(gettext 'Create a new bug')</a>"
    2.12 +			echo "<a href='?newbug'>$(gettext 'Create bug')</a>"
    2.13  			echo "$PLUGINS_TOOLS"
    2.14  		fi
    2.15  		cat << EOT