1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
|
From: Daniel Echeverry <epsilon@debian.org>
Date: Mon, 25 Oct 2021 22:42:54 -0500
Subject: Set correct install path for Debian Systems.
Forwarded: not-needed
---
Makefile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/Makefile
+++ b/Makefile
@@ -388,14 +388,14 @@
@echo "Generating path.py..."
@cp -f guake/paths.py.in guake/paths.py
@# Generic
- @sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|""|g' guake/paths.py
- @sed -i -e 's|{{ AUTOSTART_FOLDER }}|""|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
@# Dev environment:
- @sed -i -e 's|{{ LOCALE_DIR }}|get_default_locale_dir()|g' guake/paths.py
- @sed -i -e 's|{{ IMAGE_DIR }}|get_default_image_dir()|g' guake/paths.py
- @sed -i -e 's|{{ GUAKE_THEME_DIR }}|get_default_theme_dir()|g' guake/paths.py
- @sed -i -e 's|{{ GLADE_DIR }}|get_default_glade_dir()|g' guake/paths.py
- @sed -i -e 's|{{ SCHEMA_DIR }}|get_default_schema_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|{{ GUAKE_THEME_DIR }}|"$(GUAKE_THEME_DIR)"|g' guake/paths.py
+ @sed -i -e 's|{{ GLADE_DIR }}|"$(DATA_DIR)"|g' guake/paths.py
+ @sed -i -e 's|{{ SCHEMA_DIR }}|"$(SCHEMA_DIR)"|g' guake/paths.py
reno:
PIPENV_IGNORE_VIRTUALENVS=1 pipenv run reno new $(SLUG) --edit
|