From 0fd3c6557c6881d94d178d6e6d4daaffd8f4c07f Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 27 Dec 2018 16:48:39 +0000 Subject: [PATCH] meson - use install_mode instead of chmod script --- data/themes/meson.build | 1 + data/themes/nyanology/meson.build | 1 + meson.build | 1 - meson/meson_install_themes.sh | 5 ----- 4 files changed, 2 insertions(+), 6 deletions(-) delete mode 100755 meson/meson_install_themes.sh diff --git a/data/themes/meson.build b/data/themes/meson.build index 5331bd41..0b298805 100644 --- a/data/themes/meson.build +++ b/data/themes/meson.build @@ -27,6 +27,7 @@ foreach to_compile: edje_to_compile edj_targets += [custom_target(output, install:true, install_dir: edje_install_dir, + install_mode: 'rw-r--r--', depend_files: files(to_compile[1]), command: command, input: input, diff --git a/data/themes/nyanology/meson.build b/data/themes/nyanology/meson.build index 2cd5aa61..2c8420cd 100644 --- a/data/themes/nyanology/meson.build +++ b/data/themes/nyanology/meson.build @@ -12,6 +12,7 @@ edj_targets += [custom_target('nyanology.edj', depend_files: files(['about.edc', 'nyancursor.edc']), install_dir: edje_install_dir, + install_mode: 'rw-r--r--', command: command, input:'nyanology.edc', output:'nyanology.edj')] diff --git a/meson.build b/meson.build index 4df72f44..8afade3c 100644 --- a/meson.build +++ b/meson.build @@ -125,4 +125,3 @@ subdir('data') subdir('man') subdir('src/bin') -meson.add_install_script('meson/meson_install_themes.sh', edj_files) diff --git a/meson/meson_install_themes.sh b/meson/meson_install_themes.sh deleted file mode 100755 index be822816..00000000 --- a/meson/meson_install_themes.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -for x in "$@" ; do - chmod 644 "$MESON_INSTALL_DESTDIR_PREFIX/$x" && touch "$MESON_INSTALL_DESTDIR_PREFIX/$x" -done