summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-02-21 16:03:43 +0100
committerIñigo Martínez <inigomartinez@gmail.com>2018-02-27 08:22:28 +0100
commit67f7135d2eee96a1aac6526fd6f004c19121ae2a (patch)
treeed20a0e766b9756799a4b4ae5e273b2a0327f7f2
parent7a902e119ccffc578fc3eb4be185e7600ce15fb7 (diff)
downloadeog-67f7135d2eee96a1aac6526fd6f004c19121ae2a.tar.gz
build: Remove default explicit installation directories
Some meson targets that are installed in default directories are explicitly indicated. However, due to the fact that they are default installation directories, they are not necessary. https://bugzilla.gnome.org/show_bug.cgi?id=793719
-rw-r--r--meson.build1
-rw-r--r--src/meson.build4
2 files changed, 1 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 84d13d54..19210d0e 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,6 @@ eog_gir_ns = 'Eog'
eog_gir_version = '1.0'
eog_prefix = get_option('prefix')
-eog_bindir = join_paths(eog_prefix, get_option('bindir'))
eog_datadir = join_paths(eog_prefix, get_option('datadir'))
eog_includedir = join_paths(eog_prefix, get_option('includedir'))
eog_libdir = join_paths(eog_prefix, get_option('libdir'))
diff --git a/src/meson.build b/src/meson.build
index 996fa6af..5ee038a0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -174,8 +174,7 @@ pkg.generate(
variables: [
'exec_prefix=' + eog_libexecdir,
'pluginsdir=' + eog_pluginsdir
- ],
- install_dir: join_paths(eog_libdir, 'pkgconfig')
+ ]
)
eog = executable(
@@ -185,7 +184,6 @@ eog = executable(
dependencies: libeog_dep,
c_args: cflags,
install: true,
- install_dir: eog_bindir,
install_rpath: eog_pkglibdir
)