This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager.
commit 2217b7864547e8326251e61b7b248a31792b65ed Author: Simon McVittie <[email protected]> Date: Tue Sep 27 23:08:17 2016 +0100 Simplify installation by introducing ${pkgdatadir} The variable name is stolen from Automake, and has the same purpose: it's the subdirectory of ${datadir} named after this package. --- Makefile | 37 ++++++++++++++++----------------- data/bash-completion/game-data-packager | 12 +++++++---- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 9a56784..baa1813 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ GDP_MIRROR ?= localhost bindir := /usr/games datadir := /usr/share/games +pkgdatadir := ${datadir}/game-data-packager PYTHON := python3 PYFLAKES3 := $(shell if [ -x /usr/bin/pyflakes3 ] ; then echo pyflakes3 ; \ elif [ -x /usr/bin/pyflakes3k ] ; then echo pyflakes3k ; \ @@ -133,30 +134,28 @@ install: mkdir -p $(DESTDIR)$(bindir) install -m0755 out/game-data-packager $(DESTDIR)$(bindir) - mkdir -p $(DESTDIR)$(datadir)/game-data-packager - cp -ar game_data_packager/ $(DESTDIR)$(datadir)/game-data-packager/ - python3 -m game_data_packager.version $(RELEASE) > $(DESTDIR)$(datadir)/game-data-packager/game_data_packager/version.py - install -m0644 out/*.copyright $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 out/*.png $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 out/*.svgz $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 out/bash_completion $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 out/changelog.gz $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 out/copyright $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 out/vfs.zip $(DESTDIR)$(datadir)/game-data-packager/ - - install runtime/launcher.py $(DESTDIR)$(datadir)/game-data-packager/gdp-launcher - install -m0644 out/*.desktop $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 runtime/confirm-binary-only.txt $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 runtime/missing-data.txt $(DESTDIR)$(datadir)/game-data-packager/ - install -m0644 out/launch-*.json $(DESTDIR)$(datadir)/game-data-packager/ + mkdir -p $(DESTDIR)$(pkgdatadir) + cp -ar game_data_packager/ $(DESTDIR)$(pkgdatadir)/ + python3 -m game_data_packager.version $(RELEASE) > $(DESTDIR)$(pkgdatadir)/game_data_packager/version.py + install -m0644 out/*.copyright $(DESTDIR)$(pkgdatadir)/ + install -m0644 out/*.png $(DESTDIR)$(pkgdatadir)/ + install -m0644 out/*.svgz $(DESTDIR)$(pkgdatadir)/ + install -m0644 out/bash_completion $(DESTDIR)$(pkgdatadir)/ + install -m0644 out/changelog.gz $(DESTDIR)$(pkgdatadir)/ + install -m0644 out/copyright $(DESTDIR)$(pkgdatadir)/ + install -m0644 out/vfs.zip $(DESTDIR)$(pkgdatadir)/ + + install runtime/launcher.py $(DESTDIR)$(pkgdatadir)/gdp-launcher + install -m0644 out/*.desktop $(DESTDIR)$(pkgdatadir)/ + install -m0644 runtime/confirm-binary-only.txt $(DESTDIR)$(pkgdatadir)/ + install -m0644 runtime/missing-data.txt $(DESTDIR)$(pkgdatadir)/ + install -m0644 out/launch-*.json $(DESTDIR)$(pkgdatadir)/ install -d $(DESTDIR)/etc/apparmor.d/ install -m0644 etc/apparmor.d/* $(DESTDIR)/etc/apparmor.d/ mkdir -p $(DESTDIR)/usr/share/bash-completion/completions install -m0644 data/bash-completion/game-data-packager $(DESTDIR)/usr/share/bash-completion/completions/ -ifneq ($(datadir),/usr/share/games) - sed -i 's#/usr/share/games#$(datadir)#g' $(DESTDIR)/usr/share/bash-completion/completions/game-data-packager -endif + sed -i 's#pkgdatadir=.*#pkgdatadir=$(pkgdatadir)#g' $(DESTDIR)/usr/share/bash-completion/completions/game-data-packager mkdir -p $(DESTDIR)/usr/share/man/man6/ mkdir -p $(DESTDIR)/usr/share/man/fr/man6/ diff --git a/data/bash-completion/game-data-packager b/data/bash-completion/game-data-packager index 7198c91..0fc416f 100644 --- a/data/bash-completion/game-data-packager +++ b/data/bash-completion/game-data-packager @@ -1,6 +1,10 @@ _game_data_packager() { - [ -e /usr/share/games/game-data-packager ] || return + local pkgdatadir + # edited by Makefile + pkgdatadir=/usr/share/games/game-data-packager + + [ -e "$pkgdatadir" ] || return # FIXME: currently only works 100% correctly when # GAME is the first argument @@ -22,7 +26,7 @@ _game_data_packager() COMPREPLY=( $( compgen -W "su sudo pkexec" -- $cur ) ) elif [ "$prev" == '--package' ] then - [ -e /usr/share/games/game-data-packager/bash_completion ] || return + [ -e "$pkgdatadir"/bash_completion ] || return local line packages while read line do @@ -31,7 +35,7 @@ _game_data_packager() read packages break fi - done < /usr/share/games/game-data-packager/bash_completion + done < "$pkgdatadir"/bash_completion COMPREPLY=( $( compgen -W "$packages" -- $cur ) ) elif [ $COMP_CWORD -eq 1 ] then @@ -40,7 +44,7 @@ _game_data_packager() do supported="$supported $line" read - done < /usr/share/games/game-data-packager/bash_completion + done < "$pkgdatadir"/bash_completion COMPREPLY=( $( compgen -W "make-template gog steam $supported" -- $cur ) ) else COMPREPLY=() -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
