diff options
| author | Arun Raghavan <arun@arunraghavan.net> | 2016-09-02 19:08:48 +0530 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2016-09-02 20:27:32 +0530 |
| commit | 638c34da09ea3fd2640f4096e17f8cc822c27f73 (patch) | |
| tree | d3855a8d13ce0ae9020cf1a8b6c63b448ea73cd3 | |
| parent | bdc92892e5a2f1cf7323ed54f70bd484f7a9423f (diff) | |
recipes: Install to the appropriate prefix instead of install dir
This makes sure that files are correctly installed in the case of
universal builds.
https://bugzilla.gnome.org/show_bug.cgi?id=770631
| -rw-r--r-- | recipes/bionic-fixup.recipe | 2 | ||||
| -rw-r--r-- | recipes/build-tools/gobject-introspection-m4.recipe | 2 | ||||
| -rw-r--r-- | recipes/build-tools/vala-m4.recipe | 4 | ||||
| -rw-r--r-- | recipes/tinyalsa.recipe | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/recipes/bionic-fixup.recipe b/recipes/bionic-fixup.recipe index 0c00ab17..59426c3d 100644 --- a/recipes/bionic-fixup.recipe +++ b/recipes/bionic-fixup.recipe @@ -23,7 +23,7 @@ class Recipe(recipe.Recipe): raise InvalidRecipeError(self, "Invalid platform") def install(self): - include_path = os.path.join(self.config.install_dir, 'include') + include_path = os.path.join(self.config.prefix, 'include') bionicfixup_path = os.path.join(self.config.recipes_dir, 'bionic-fixup') if not os.path.exists(include_path): os.makedirs(include_path) diff --git a/recipes/build-tools/gobject-introspection-m4.recipe b/recipes/build-tools/gobject-introspection-m4.recipe index 16af9b31..f88db711 100644 --- a/recipes/build-tools/gobject-introspection-m4.recipe +++ b/recipes/build-tools/gobject-introspection-m4.recipe @@ -25,4 +25,4 @@ class Recipe(recipe.Recipe): def install(self): shutil.copy(os.path.join(self.build_dir, 'm4', 'introspection.m4'), - os.path.join(self.config.install_dir, 'share', 'aclocal')) + os.path.join(self.config.prefix, 'share', 'aclocal')) diff --git a/recipes/build-tools/vala-m4.recipe b/recipes/build-tools/vala-m4.recipe index df8b22be..caf83ea3 100644 --- a/recipes/build-tools/vala-m4.recipe +++ b/recipes/build-tools/vala-m4.recipe @@ -26,9 +26,9 @@ class Recipe(recipe.Recipe): def install(self): shutil.copy(os.path.join(self.build_dir, 'vapigen', 'vapigen.m4'), - os.path.join(self.config.install_dir, 'share', + os.path.join(self.config.prefix, 'share', 'aclocal', 'vala.m4')) - destdir = os.path.join(self.config.install_dir, 'share', 'vala') + destdir = os.path.join(self.config.prefix, 'share', 'vala') if not os.path.exists(destdir): os.makedirs(destdir) shutil.copy(os.path.join(self.build_dir, 'vapigen', 'Makefile.vapigen'), diff --git a/recipes/tinyalsa.recipe b/recipes/tinyalsa.recipe index aa02c638..a15886d6 100644 --- a/recipes/tinyalsa.recipe +++ b/recipes/tinyalsa.recipe @@ -23,8 +23,8 @@ class Recipe(recipe.Recipe): raise InvalidRecipeError(self, "Invalid platform") def install(self): - include_path = os.path.join(self.config.install_dir, 'include', 'tinyalsa') - library_path = os.path.join(self.config.install_dir, 'lib') + include_path = os.path.join(self.config.prefix, 'include', 'tinyalsa') + library_path = os.path.join(self.config.prefix, 'lib') tinyalsa_header = os.path.join(self.build_dir, 'include', 'tinyalsa', 'asoundlib.h') tinyalsa_lib = os.path.join(self.build_dir, 'libtinyalsa.a') |