[gnome-music/wip/jfelder/gnome-music-in-local: 2/2] gnome-music.in: Do not use pyexecdir variable



commit 850418281040b32800ed1305bf1834e82e704313
Author: Jean Felder <jfelder src gnome org>
Date:   Wed Mar 18 17:29:50 2020 +0100

    gnome-music.in: Do not use pyexecdir variable
    
    'pyexecdir' was used by JHBuild installations to find the associated
    pygobject module. JHBuild is no longer used for development
    purpose. Nowadays, flatpak is the preferred framework.

 gnome-music.in | 3 ---
 meson.build    | 2 --
 2 files changed, 5 deletions(-)
---
diff --git a/gnome-music.in b/gnome-music.in
index 29e30635..908df023 100755
--- a/gnome-music.in
+++ b/gnome-music.in
@@ -32,9 +32,6 @@ import sys
 _LOCAL = @local_build@
 
 if _LOCAL:
-    # In the local use, look for the pygobject module
-    sys.path.insert(1, '@pyexecdir@')
-
     # In the local use case, use gnomemusic module from the sourcetree
     sys.path.insert(1, '@pythondir@')
 
diff --git a/meson.build b/meson.build
index db526527..9bd65331 100644
--- a/meson.build
+++ b/meson.build
@@ -82,7 +82,6 @@ bin_config.set('rdnn_name', PROJECT_RDNN_NAME)
 bin_config.set('pkgdatadir', PKGDATA_DIR)
 bin_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
 bin_config.set('pythondir', PYTHON_DIR)
-bin_config.set('pyexecdir', py_installation.get_path('stdlib'))
 bin_config.set('schemasdir', PKGDATA_DIR)
 # Used for libgd/gfm
 bin_config.set('pkglibdir', PKGLIB_DIR)
@@ -104,7 +103,6 @@ local_config.set('rdnn_name', PROJECT_RDNN_NAME)
 local_config.set('pkgdatadir', join_paths(meson.build_root(), 'data'))
 local_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
 local_config.set('pythondir', meson.source_root())
-local_config.set('pyexecdir', meson.source_root())
 local_config.set('schemasdir', join_paths(meson.build_root(), 'data'))
 # Used for libgd/gfm
 local_config.set('pkglibdir', join_paths(meson.build_root(), 'subprojects', 'libgd', 'libgd'))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]