aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Freund <ifreund@ifreund.xyz>2020-07-01 02:41:00 +0200
committerFelix Queißner <felix@ib-queissner.de>2020-07-01 11:02:19 +0200
commit5d409b0db911ec839d3c9b71b08a3269d20cb6bf (patch)
treec8412713d7ef2ccad508e25dd29d7c07cd69a12f
parent33bde18e393b4c4ca37d5dde15154e097b19f96c (diff)
downloadkristall-5d409b0db911ec839d3c9b71b08a3269d20cb6bf.tar.gz
Pass -D flag to install instead of mkdir -p
This causes install to create directories in the install path if they do not already exist. mkdir -p doesn't work here if prefix directories don't exist yet.
-rw-r--r--Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 76a60cd..e666403 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ PREFIX?=/usr/local
# What to run to install various files
INSTALL?=install
# Run to install the actual binary
-INSTALL_PROGRAM=$(INSTALL) -m 755
+INSTALL_PROGRAM=$(INSTALL) -Dm 755
# Run to install application data, with differing permissions
-INSTALL_DATA=$(INSTALL) -m 644
+INSTALL_DATA=$(INSTALL) -Dm 644
# Directories into which to install the various files
bindir=$(DESTDIR)$(PREFIX)/bin
@@ -20,13 +20,6 @@ build/kristall: src/*
cd build && qmake ../src/kristall.pro && $(MAKE) $(MAKEFLAGS)
install: kristall
- # Create target directories
- mkdir -p $(sharedir)/icons/hicolor/scalable/apps/
- mkdir -p $(sharedir)/icons/hicolor/16x16/apps/
- mkdir -p $(sharedir)/icons/hicolor/32x32/apps/
- mkdir -p $(sharedir)/icons/hicolor/64x64/apps/
- mkdir -p $(sharedir)/icons/hicolor/128x128/apps/
- mkdir -p $(sharedir)/applications/
# Install icons
$(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