projectm: fix installation on hosts where projectm is not installed

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-06-04 22:48:01 +02:00
parent d8730f3c70
commit 569666535f
2 changed files with 32 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
From 5a2f6eec3bd27725cd957e1642008f34f3b82f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 4 Jun 2018 22:35:38 +0200
Subject: [PATCH] Makefile.am: Fix installation with DESTDIR set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 062bb3ca..19dbef1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,8 @@ pm_shaders__DATA = src/libprojectM/Renderer/blur.cg \
# find and install all preset files
install-data-local:
- test -z $(pkgdatadir) || $(MKDIR_P) $(pm_presets_dir)
- find "$(PRESETSDIR)" -type f -exec $(INSTALL_DATA) {} $(pm_presets_dir) \;
+ test -z $(DESTDIR)$(pkgdatadir) || $(MKDIR_P) $(DESTDIR)$(pm_presets_dir)
+ find "$(PRESETSDIR)" -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(pm_presets_dir) \;
# from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268
# ptomato https://stackoverflow.com/users/172999/ptomato
--
2.14.3

View File

@@ -17,6 +17,7 @@ SRC_URI = " \
git://github.com/projectM-visualizer/projectm.git;name=projectm \
http://spiegelmc.com.s3.amazonaws.com/pub/projectm_presets.zip;name=presets \
file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \
file://0002-Makefile.am-Fix-installation-with-DESTDIR-set.patch \
"
SRCREV_projectm = "9650468607537a028e4d71523c5e88a81f506578"
SRC_URI[presets.md5sum] = "8976d72c05e3f4ddee996c6f2e98fc63"