# HG changeset patch # User Christophe Lincoln # Date 1487635981 -3600 # Node ID 4dab1a5b9cb6a6edb56f23760b17b24f620d2ae6 # Parent 039c90c6049422ad4c8970f343a53b0fb98341fc Fix Makefile diff -r 039c90c60494 -r 4dab1a5b9cb6 Makefile --- a/Makefile Tue Feb 21 00:51:31 2017 +0100 +++ b/Makefile Tue Feb 21 01:13:01 2017 +0100 @@ -8,14 +8,15 @@ VAR?=/var/lib/slitaz LINGUAS?=de el es fr ja pl pt_BR ru vi zh_CN -all: +all: msgfmt # i18n pot: xgettext -o po/tazbug.pot -L Shell --package-name="SliTaz Bugs" \ ./web/bugs.cgi - #./tazbug + xgettext -o po/cli/tazbug-cli.pot -L Shell --package-name="SliTaz Bugs" \ + ./tazbug msgmerge: @for l in $(LINGUAS); do \ @@ -33,26 +34,31 @@ # Client install only. Server part is not packaged install: - #install -m 0777 -d $(DESTDIR)$(PREFIX)/bin + install -m 0777 -d $(DESTDIR)$(PREFIX)/bin install -m 0777 -d $(DESTDIR)$(PREFIX)/share/applications - #install -m 0755 tazbug $(DESTDIR)$(PREFIX)/bin + install -m 0755 tazbug $(DESTDIR)$(PREFIX)/bin install -m 0644 data/tazbug.desktop \ $(DESTDIR)$(PREFIX)/share/applications -# On SliTaz vhost: make install-server WEB=/home/slitaz/www +# On SliTaz vhost: make install-web WEB=/home/slitaz/www -install-server: - install -m 0777 -d $(DESTDIR)/etc/slitaz +install-web: install -m 0700 -d $(DESTDIR)$(VAR)/people install -m 0700 -d $(DESTDIR)$(VAR)/auth install -m 0777 -d $(DESTDIR)$(WEB)/bugs - install -m 0644 tazbug.conf $(DESTDIR)/etc/slitaz + # authfile touch $(DESTDIR)$(VAR)/auth/people chmod 0600 $(DESTDIR)$(VAR)/auth/people + # admin users + touch $(DESTDIR)$(VAR)/auth/admin + chmod 0600 $(DESTDIR)$(VAR)/auth/people cp -a web/* $(DESTDIR)$(WEB)/bugs cp README $(DESTDIR)$(WEB)/bugs chown -R www.www $(DESTDIR)$(VAR)/* chown -R www.www $(DESTDIR)$(WEB)/bugs/bug + # i18n + install -m 0755 -d $(DESTDIR)$(PREFIX)/share/locale + cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale # Uninstall client diff -r 039c90c60494 -r 4dab1a5b9cb6 web/bugs.cgi --- a/web/bugs.cgi Tue Feb 21 00:51:31 2017 +0100 +++ b/web/bugs.cgi Tue Feb 21 01:13:01 2017 +0100 @@ -823,10 +823,10 @@
$BUGS_TOOLS - $(gettext 'View closed bugs') + $(gettext 'Closed bugs') EOT if check_auth; then - echo "$(gettext 'Create a new bug')" + echo "$(gettext 'Create bug')" echo "$PLUGINS_TOOLS" fi cat << EOT