diff options
author | Zeeshan Ali <zeenix@collabora.co.uk> | 2018-09-24 14:18:44 +0200 |
---|---|---|
committer | Zeeshan Ali <zeenix@collabora.co.uk> | 2018-09-24 14:18:44 +0200 |
commit | 0a45aa741daad4e8c7f7d860ed341c4c03178a7c (patch) | |
tree | 4a0ef3dda1893fbb7a36bb6759b4a58985808244 /demo | |
parent | 95fbadd7f9226c17ac7369c8f7bb6711ba40a5db (diff) | |
download | geoclue-0a45aa741daad4e8c7f7d860ed341c4c03178a7c.tar.gz |
Revert "build: Install demo agent to autostart directory too"
This reverts commit b8fa586f84c5fa485fe3924becc4ff2b08d55938.
Diffstat (limited to 'demo')
-rw-r--r-- | demo/install-file.py | 13 | ||||
-rw-r--r-- | demo/meson.build | 19 |
2 files changed, 6 insertions, 26 deletions
diff --git a/demo/install-file.py b/demo/install-file.py deleted file mode 100644 index f5db502..0000000 --- a/demo/install-file.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/python3 - -# A simple script that copies given file (first arg) to a given location (second arg) - -import sys -from shutil import copyfile - -if len(sys.argv) < 3: - print('Usage: ' + sys.argv[0] + ' SOURCE_PATH DESTINATION_PATH') - - sys.exit(-1) - -copyfile(sys.argv[1], sys.argv[2]) diff --git a/demo/meson.build b/demo/meson.build index b1e4285..61df493 100644 --- a/demo/meson.build +++ b/demo/meson.build @@ -48,17 +48,10 @@ if get_option('demo-agent') desktop_in = configure_file(output: 'geoclue-demo-agent.desktop.in', input: 'geoclue-demo-agent.desktop.in.in', configuration: desktop_conf) - desktop_file = i18n.merge_file(output: 'geoclue-demo-agent.desktop', - input: desktop_in, - type: 'desktop', - po_dir: '../po', - install: true, - install_dir: desktop_dir) - - # Also install in the autostart directory. - autostart_path = join_paths(get_option('sysconfdir'), - 'xdg/autostart/geoclue-demo-agent.desktop') - meson.add_install_script('install-file.py', - desktop_file.full_path(), - autostart_path) + i18n.merge_file(output: 'geoclue-demo-agent.desktop', + input: desktop_in, + type: 'desktop', + po_dir: '../po', + install: true, + install_dir: desktop_dir) endif |