From 5d409b0db911ec839d3c9b71b08a3269d20cb6bf Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Wed, 1 Jul 2020 02:41:00 +0200 Subject: 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. --- Makefile | 11 ++--------- 1 file 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 -- cgit v1.2.3