Use standard make names

from https://www.gnu.org/prep/standards/html_node/Directory-Variables.html

close #1255

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
This commit is contained in:
Gaetan Semet 2018-04-11 13:44:18 +02:00
parent 3701308cde
commit 97bf2cb225
28 changed files with 160 additions and 48 deletions

View File

@ -2,14 +2,17 @@
PYTHON_INTERPRETER=python3
MODULE:=guake
INSTALL_ROOT:=/
PREFIX:=/usr/local
DESTDIR:=/
prefix:=/usr/local
exec_prefix:=$(prefix)
bindir = $(exec_prefix)/bin
# findout the dist-package directory name. Under most system, users can install on dist-package.
# On debian, site-package is reserved for the official python packages and has precedence over
# dist-package
DIST_PACKAGE_NAME:=$(shell $(PYTHON_INTERPRETER) -c "import site; import os; print(os.path.basename(site.getsitepackages()[0]))")
DIST_PACKAGE=$(PREFIX)/lib/python$(shell $(PYTHON_INTERPRETER) -c "import sys; v = sys.version_info; print('{}.{}'.format(v.major, v.minor))")/$(DIST_PACKAGE_NAME)
OLD_PREFIX:=$(INSTALL_ROOT)usr
PYTHON_SITE_PACKAGE_NAME:=$(shell $(PYTHON_INTERPRETER) -c "import site; import os; print(os.path.basename(site.getsitepackages()[0]))")
PYTHON_SITE_PACKAGE_DIR=$(prefix)/lib/python$(shell $(PYTHON_INTERPRETER) -c "import sys; v = sys.version_info; print('{}.{}'.format(v.major, v.minor))")/$(PYTHON_SITE_PACKAGE_NAME)
OLD_PREFIX:=$(DESTDIR)usr
ROOT_DIR=$(shell pwd)
DATA_DIR=$(ROOT_DIR)/guake/data
COMPILE_SCHEMA:=1
@ -18,16 +21,20 @@ COMPILE_SCHEMA:=1
AUTOSTART_FOLDER:=~/.config/autostart
DEV_IMAGE_DIR:=$(DATA_DIR)/pixmaps
DEV_LOCALE_DIR:=$(PREFIX)/share/locale
DEV_LOCALE_DIR:=$(localedir)
DEV_GLADE_DIR:=$(DATA_DIR)
DEV_SCHEMA_DIR:=$(DATA_DIR)
SHARE_DIR:=$(PREFIX)/share/guake
datarootdir:=$(prefix)/share
datadir:=$(datarootdir)
localedir:=$(datarootdir)/locale
gsettingsschemadir:=$(datarootdir)/glib-2.0/schemas
SHARE_DIR:=$(datadir)/guake
LOGIN_DESTOP_PATH = $(SHARE_DIR)
IMAGE_DIR:=$(SHARE_DIR)/pixmaps
LOCALE_DIR:=$(PREFIX)/share/locale
GLADE_DIR:=$(SHARE_DIR)
SCHEMA_DIR:=$(PREFIX)/share/glib-2.0/schemas/
SCHEMA_DIR:=$(gsettingsschemadir)
SLUG:=fragment_name
default: prepare-install
@ -67,14 +74,14 @@ install-guake:
@if [ -f guake/paths.py.dev ]; then rm -f guake/paths.py.dev; fi
@if [ -f guake/paths.py ]; then mv guake/paths.py guake/paths.py.dev; fi
@cp -f guake/paths.py.in guake/paths.py
@sed -i -e 's|{{ LOCALE_DIR }}|$(LOCALE_DIR)|g' guake/paths.py
@sed -i -e 's|{{ LOCALE_DIR }}|$(localedir)|g' guake/paths.py
@sed -i -e 's|{{ IMAGE_DIR }}|$(IMAGE_DIR)|g' guake/paths.py
@sed -i -e 's|{{ GLADE_DIR }}|$(GLADE_DIR)|g' guake/paths.py
@sed -i -e 's|{{ SCHEMA_DIR }}|$(SCHEMA_DIR)|g' guake/paths.py
@sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|$(LOGIN_DESTOP_PATH)|g' guake/paths.py
@sed -i -e 's|{{ AUTOSTART_FOLDER }}|$(AUTOSTART_FOLDER)|g' guake/paths.py
@$(PYTHON_INTERPRETER) setup.py install --root "$(INSTALL_ROOT)" --prefix="$(PREFIX)" --optimize=1
@$(PYTHON_INTERPRETER) setup.py install --root "$(DESTDIR)" --prefix="$(prefix)" --optimize=1
@rm -f guake/paths.py
@if [ -f guake/paths.py.dev ]; then mv guake/paths.py.dev guake/paths.py; fi
@ -86,47 +93,47 @@ install-locale:
for f in $$(find po -iname "*.mo"); do \
l="$${f%%.*}"; \
lb=$$(basename $$l); \
install -Dm644 "$$f" "$(INSTALL_ROOT)$(LOCALE_DIR)/$$lb/LC_MESSAGES/guake.mo"; \
install -Dm644 "$$f" "$(DESTDIR)$(localedir)/$$lb/LC_MESSAGES/guake.mo"; \
done;
uninstall-locale: install-old-locale
find $(LOCALE_DIR)/ -name "guake.mo" -exec rm -f {} \;
find $(DESTDIR)$(localedir)/ -name "guake.mo" -exec rm -f {} \;
install-old-locale:
@find $(OLD_PREFIX)/share/locale/ -name "guake.mo" -exec rm -f {} \;
install-schemas:
install -Dm644 "guake/data/guake.desktop" "$(INSTALL_ROOT)$(PREFIX)/share/applications/guake.desktop"
install -Dm644 "guake/data/guake-prefs.desktop" "$(INSTALL_ROOT)$(PREFIX)/share/applications/guake-prefs.desktop"
mkdir -p $(INSTALL_ROOT)$(IMAGE_DIR)
install -Dm644 guake/data/pixmaps/*.png "$(INSTALL_ROOT)$(IMAGE_DIR)/"
install -Dm644 guake/data/pixmaps/*.svg "$(INSTALL_ROOT)$(IMAGE_DIR)/"
install -Dm644 guake/data/pixmaps/guake.png "$(INSTALL_ROOT)$(PREFIX)/share/pixmaps/guake.png"
mkdir -p $(INSTALL_ROOT)$(SHARE_DIR)
mkdir -p $(INSTALL_ROOT)$(GLADE_DIR)
install -Dm644 guake/data/*.glade "$(INSTALL_ROOT)$(GLADE_DIR)"
install -Dm644 "guake/data/guake.desktop" "$(DESTDIR)$(prefix)/share/applications/guake.desktop"
install -Dm644 "guake/data/guake-prefs.desktop" "$(DESTDIR)$(prefix)/share/applications/guake-prefs.desktop"
mkdir -p $(DESTDIR)$(IMAGE_DIR)
install -Dm644 guake/data/pixmaps/*.png "$(DESTDIR)$(IMAGE_DIR)/"
install -Dm644 guake/data/pixmaps/*.svg "$(DESTDIR)$(IMAGE_DIR)/"
install -Dm644 guake/data/pixmaps/guake.png "$(DESTDIR)$(prefix)/share/pixmaps/guake.png"
mkdir -p $(DESTDIR)$(SHARE_DIR)
mkdir -p $(DESTDIR)$(GLADE_DIR)
install -Dm644 guake/data/*.glade "$(DESTDIR)$(GLADE_DIR)"
mkdir -p $(SHARE_DIR)
install -Dm644 "guake/data/autostart-guake.desktop" "$(INSTALL_ROOT)$(SHARE_DIR)"
install -Dm644 "guake/data/autostart-guake.desktop" "$(DESTDIR)$(SHARE_DIR)"
mkdir -p $(SCHEMA_DIR)
install -Dm644 "guake/data/org.guake.gschema.xml" "$(INSTALL_ROOT)$(SCHEMA_DIR)/"
install -Dm644 "guake/data/org.guake.gschema.xml" "$(DESTDIR)$(SCHEMA_DIR)/"
compile-shemas:
if [ $(COMPILE_SCHEMA) = 1 ]; then glib-compile-schemas $(INSTALL_ROOT)$(PREFIX)/share/glib-2.0/schemas/ fi
if [ $(COMPILE_SCHEMA) = 1 ]; then glib-compile-schemas $(DESTDIR)$(prefix)/share/glib-2.0/schemas/; fi
uninstall-system: uninstall-schemas
@pip3 uninstall -y guake || true
@rm -f $(INSTALL_ROOT)$(PREFIX)/bin/guake
@rm -f $(INSTALL_ROOT)$(PREFIX)/bin/guake-prefs
@rm -rf $(PYTHON_SITE_PACKAGE_DIR)/guake || true
@rm -f $(bindir)/guake
@rm -f $(bindir)/guake-prefs
purge-system: uninstall-system reset
uninstall-schemas: uninstall-old-schemas
rm -f "$(INSTALL_ROOT)$(PREFIX)/share/applications/guake.desktop"
rm -f "$(INSTALL_ROOT)$(PREFIX)/share/applications/guake-prefs.desktop"
rm -fr "$(INSTALL_ROOT)$(IMAGE_DIR)"
rm -fr "$(INSTALL_ROOT)$(SHARE_DIR)"
rm -f "$(INSTALL_ROOT)$(SCHEMA_DIR)/org.guake.gschema.xml"
rm -f "$(prefix)/share/applications/guake.desktop"
rm -f "$(prefix)/share/applications/guake-prefs.desktop"
rm -fr "$(IMAGE_DIR)"
rm -fr "$(SHARE_DIR)"
rm -f "$(SCHEMA_DIR)/org.guake.gschema.xml"
uninstall-old-schemas:
@rm -f "$(OLD_PREFIX)/share/applications/guake.desktop"
@ -135,10 +142,10 @@ uninstall-old-schemas:
@rm -f "$(OLD_PREFIX)/share/glib-2.0/schemas/org.guake.gschema.xml"
@rm -f "$(OLD_PREFIX)/share/glib-2.0/schemas/schema.guake.gschema.xml"
@rm -fr "$(OLD_PREFIX)/share/guake"
@rm -f $(OLD_PREFIX)/lib/python$(shell $(PYTHON_INTERPRETER) -c "import sys; v = sys.version_info; print('{}.{}'.format(v.major, v.minor))")/$(DIST_PACKAGE)/guake/data/schema.guake.gschema.xml
@rm -f $(OLD_PREFIX)/lib/python$(shell $(PYTHON_INTERPRETER) -c "import sys; v = sys.version_info; print('{}.{}'.format(v.major, v.minor))")/$(PYTHON_SITE_PACKAGE_DIR)/guake/data/schema.guake.gschema.xml
reinstall:
sudo make uninstall && make && sudo make install && /usr/local/bin/guake
sudo make uninstall && make && sudo make install && $(DESTDIR)$(bindir)/guake
compile-glib-schemas-dev: clean-schemas
glib-compile-schemas --strict guake/data/

View File

@ -7,11 +7,18 @@ NEWS
Release Summary
~~~~~~~~~~~~~~~
Package maintainers should read the "Notes for Package Maintainers" of this release note carefully.
This version of Guake brings mostly bug fixes, and some new features like "Quick Open on selection".
I have also reworked internally the Quick Open so that it can automatically open files from logs
from pytest and other python development tools output. However, there might still some false
positive on the hovering of the mouse in the terminal, the most famous being the output of ``ls -l``
which may have the mouse looks like it sees hyperlinks on the terminal everywhere. Click does
nothing but its an annoying limitation. Package maintainers should read the "Notes for Package
Maintainers" of this release note carefully.
New Features
~~~~~~~~~~~~
- New "start at login" option in the settings (only for GNOME) #251
- Add ``--verbose``/``-v`` parameter to enable debug logging. Please note the existing ``-v`` (for
version number) has been renamed ``-V``.
- Add great color palettes from `Guake Color
@ -99,17 +106,18 @@ Notes for Package Maintainers
.. code:: bash
sudo make install \
PREFIX=/usr \
DIST_PACKAGE_NAME=site-package \
LOCALE_DIR=/usr/share/locale
prefix=/usr \
DESTDIR=/path/for/packager \
PYTHON_SITE_PACKAGE_NAME=site-package \
localedir=/usr/share/locale
The main overrides are:
- ``IMAGE_DIR``: where the pixmap should be installed. Default:
``/usr/local/share/guake/pixmaps``
- ``LOCALE_DIR``: where locales should be installed. Default: ``/usr/local/share/locale``
- ``localedir``: where locales should be installed. Default: ``/usr/local/share/locale``
- ``GLADE_DIR``: where the Glade files should be installed. Default: ``/usr/local/share/guake``
- ``SCHEMA_DIR``: where gsettings/dconf schema should be installed. Default:
- ``gsettingsschemadir``: where gsettings/dconf schema should be installed. Default:
``/usr/local/share/glib-2.0/schemas/``
I invite package maintainers to open tickets on Github about any other difficulties encountered

View File

@ -35,12 +35,12 @@ from gi.repository import Keybinder
from gi.repository import Pango
from gi.repository import Vte
from guake.common import ShowableError
from guake.common import bindtextdomain
from guake.common import get_binaries_from_path
from guake.common import gladefile
from guake.common import hexify_color
from guake.common import pixmapfile
from guake.common import ShowableError
from guake.globals import ALIGN_BOTTOM
from guake.globals import ALIGN_CENTER
from guake.globals import ALIGN_LEFT
@ -54,8 +54,8 @@ from guake.paths import AUTOSTART_FOLDER
from guake.paths import LOCALE_DIR
from guake.paths import LOGIN_DESTOP_PATH
from guake.simplegladeapp import SimpleGladeApp
from guake.terminal import g_pcre2_enabled
from guake.terminal import GuakeTerminal
from guake.terminal import g_pcre2_enabled
from locale import gettext as _
# pylint: disable=unsubscriptable-object

View File

@ -1233,6 +1233,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "S'ha produït un error en definir la drecera de teclat"

View File

@ -1262,6 +1262,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "chyba klávesových zkratek"

View File

@ -1261,6 +1261,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "Path to script executed on Guake start:"
#~ msgstr "Pfad zu einem Skript das beim Start ausgeführt wird:"

View File

@ -1235,6 +1235,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "σφάλμα συντόμευσης πληκτρολογίου"

View File

@ -1261,6 +1261,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "Error al asignar tecla"

View File

@ -1227,6 +1227,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "خطا در باگزاری کلید"

View File

@ -1008,6 +1008,10 @@ msgstr "Configure vos sessions Guake"
msgid "Terminal;Utility;"
msgstr "Terminal;Utilitaires;"
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "Quick Open: '{!s}...'"
#~ msgstr "Ouverture Rapide: {!s}..."

View File

@ -1234,6 +1234,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "erro de combinación de teclas"

View File

@ -1233,6 +1233,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "Greška dodjeljivanja tipke"

View File

@ -1232,6 +1232,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "Hiba történt a billentyűkombináció hozzárendelésekor"

View File

@ -1183,5 +1183,9 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "http://guake.org"
#~ msgstr "http://guake.org"

View File

@ -1256,6 +1256,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "errore di assegnazione tasto"

View File

@ -1186,6 +1186,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "キーの割り当てエラー"

View File

@ -1227,6 +1227,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "키 바인딩 에러"

View File

@ -1227,6 +1227,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "Hurtigtast error"

View File

@ -1254,6 +1254,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "Fout bij toets-binding"

View File

@ -1195,6 +1195,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "ਕੁੰਜੀ ਬਾਈਡਿੰਗ ਗਲਤੀ"

View File

@ -1000,3 +1000,7 @@ msgstr "Terminal;Utility;"
#: guake/data/guake.template.desktop:4
msgid "Use the command line in a Quake-like terminal"
msgstr "Używanie wiersza poleceń w terminalu w stylu gry Quake"
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""

View File

@ -1254,6 +1254,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "erro na associação de atalhos"

View File

@ -1246,6 +1246,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "Path to script executed on Guake start:"
#~ msgstr "Путь к скрипту, запускаемому при старте Guake:"

View File

@ -1232,6 +1232,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "tangentbindningsfel"

View File

@ -1231,6 +1231,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "kısayol atama hatası"

View File

@ -1236,6 +1236,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "key binding error"
#~ msgstr "не вдалося створити прив’язку клавіш"

View File

@ -1228,6 +1228,10 @@ msgstr ""
msgid "Quick Open..."
msgstr ""
#: guake/data/prefs.glade:223
msgid "Start Guake at login"
msgstr ""
#~ msgid "0 means no size limit"
#~ msgstr "0表示没有大小限制"

View File

@ -25,16 +25,17 @@ notes_for_package_maintainers:
.. code-block:: bash
sudo make install \
PREFIX=/usr \
DIST_PACKAGE_NAME=site-package \
LOCALE_DIR=/usr/share/locale
prefix=/usr \
DESTDIR=/path/for/packager \
PYTHON_SITE_PACKAGE_NAME=site-package \
localedir=/usr/share/locale
The main overrides are:
- ``IMAGE_DIR``: where the pixmap should be installed. Default: ``/usr/local/share/guake/pixmaps``
- ``LOCALE_DIR``: where locales should be installed. Default: ``/usr/local/share/locale``
- ``localedir``: where locales should be installed. Default: ``/usr/local/share/locale``
- ``GLADE_DIR``: where the Glade files should be installed. Default: ``/usr/local/share/guake``
- ``SCHEMA_DIR``: where gsettings/dconf schema should be installed.
- ``gsettingsschemadir``: where gsettings/dconf schema should be installed.
Default: ``/usr/local/share/glib-2.0/schemas/``
I invite package maintainers to open tickets on Github about any other difficulties