-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* meson: Require meson 0.49 and fix wrong version Follow up of 878431b. "/ with string arguments" requires meson 0.49.0. * meson: Actually install usr and etc files This is where the program actually lives. * meson: Run post install script Since we install usr/share/glib-2.0/schemas/org.x.sticky.gschema.xml, we should run the glib-compile-schemas. * meson: Fix org.x.sticky.service hardcode bindir Let's respect meson's bindir option. * usr/bin/sticky: Make this executable Instead of telling people in README.md, let's just do it ourselves.
- Loading branch information
1 parent
878431b
commit 3a30b05
Showing
6 changed files
with
28 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
[D-BUS Service] | ||
Name=org.x.sticky | ||
Exec=/usr/bin/sticky | ||
Exec=@bindir@/sticky |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,20 @@ | ||
project('sticky', version: '1.17') | ||
project('sticky', version: '1.19', meson_version: '>= 0.49.0') | ||
|
||
i18n = import('i18n') | ||
|
||
gettext_package = meson.project_name() | ||
|
||
prefix = get_option('prefix') | ||
bindir = get_option('bindir') | ||
datadir = get_option('datadir') | ||
sysconfdir = get_option('sysconfdir') | ||
|
||
podir = meson.source_root() / 'po' | ||
|
||
subdir('data') | ||
subdir('po') | ||
|
||
install_subdir('etc', install_dir: sysconfdir, strip_directory: true) | ||
install_subdir('usr', install_dir: prefix, strip_directory: true) | ||
|
||
meson.add_install_script('meson/meson-postinstall.sh') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#!/bin/sh | ||
|
||
# Package managers set this so we don't need to run | ||
if [ -z "$DESTDIR" ]; then | ||
echo Compiling GSettings schemas... | ||
glib-compile-schemas ${MESON_INSTALL_PREFIX}/share/glib-2.0/schemas | ||
|
||
echo Updating icon cache... | ||
gtk-update-icon-cache -qtf ${MESON_INSTALL_PREFIX}/share/icons/hicolor | ||
fi |
Empty file.