aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix (xq) Queißner <git@mq32.de>2020-07-20 17:34:36 +0200
committerFelix (xq) Queißner <git@mq32.de>2020-07-20 17:34:36 +0200
commit06abd3f6f20ca2008b71fa3967baeaf53f5775eb (patch)
treeef7c5897a6dca85720de23da059b0892a69ab5aa
parent422f15c7db706299d85a2ecde4cd0f019f39dc59 (diff)
downloadkristall-06abd3f6f20ca2008b71fa3967baeaf53f5775eb.tar.gz
Reincludes makedir in makefile.
-rw-r--r--Makefile14
-rw-r--r--README.md1
-rw-r--r--src/builtins.qrc1
-rw-r--r--src/favourites.init5
4 files changed, 19 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e666403..4f77fd2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,12 @@ INSTALL?=install
# Run to install the actual binary
INSTALL_PROGRAM=$(INSTALL) -Dm 755
# Run to install application data, with differing permissions
-INSTALL_DATA=$(INSTALL) -Dm 644
+INSTALL_DATA=$(INSTALL) -m 644
# Directories into which to install the various files
bindir=$(DESTDIR)$(PREFIX)/bin
sharedir=$(DESTDIR)$(PREFIX)/share
+MAKEDIR=makedir -p
kristall: build/kristall
cp build/kristall $@
@@ -20,7 +21,16 @@ build/kristall: src/*
cd build && qmake ../src/kristall.pro && $(MAKE) $(MAKEFLAGS)
install: kristall
- # Install icons
+ # Prepare directories
+ $(MAKEDIR) $(sharedir)/icons/hicolor/scalable/apps/
+ $(MAKEDIR) $(sharedir)/icons/hicolor/16x16/apps/
+ $(MAKEDIR) $(sharedir)/icons/hicolor/32x32/apps/
+ $(MAKEDIR) $(sharedir)/icons/hicolor/64x64/apps/
+ $(MAKEDIR) $(sharedir)/icons/hicolor/128x128/apps/
+ $(MAKEDIR) $(sharedir)/applications/
+ $(MAKEDIR) $(bindir)
+
+ # Install files
$(INSTALL_DATA) src/icons/kristall.svg $(sharedir)/icons/hicolor/scalable/apps/net.random-projects.kristall.svg
$(INSTALL_DATA) src/icons/kristall-16.png $(sharedir)/icons/hicolor/16x16/apps/net.random-projects.kristall.png
$(INSTALL_DATA) src/icons/kristall-32.png $(sharedir)/icons/hicolor/32x32/apps/net.random-projects.kristall.png
diff --git a/README.md b/README.md
index dbde7db..b1472ab 100644
--- a/README.md
+++ b/README.md
@@ -77,4 +77,5 @@ See [ROADMAP.md](ROADMAP.md)
## License
Kristall is released under the GPLv3 or (at your option) any later version.
+[See LICENCE as well](LICENCE)
[See LICENCE as well](LICENCE) \ No newline at end of file
diff --git a/src/builtins.qrc b/src/builtins.qrc
index 6a6d56c..5ce8bd1 100644
--- a/src/builtins.qrc
+++ b/src/builtins.qrc
@@ -77,5 +77,6 @@
<file>icons/light/objects/volume-on.svg</file>
<file>icons/light/index.theme</file>
<file>about/style-display.gemini</file>
+ <file>favourites.init</file>
</qresource>
</RCC>
diff --git a/src/favourites.init b/src/favourites.init
index e69de29..483e771 100644
--- a/src/favourites.init
+++ b/src/favourites.init
@@ -0,0 +1,5 @@
+Sites:Project Gemini:gemini://gemini.circumlunar.space/
+Sites:Kristall Small-Internet Browser:gemini://kristall.random-projects.net/
+Tools:GUS Search Engine:gemini://gus.guru/
+Tools:CAPCOM:gemini://gemini.circumlunar.space/capcom/
+Games:Astrobotany:gemini://astrobotany.mozz.us