aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-11-25 23:42:52 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-11-25 23:42:52 +0200
commit75e6f33bb7a93f2caea4698c32ccd73169471349 (patch)
treed6102425b6d9c938cac4c558e4366b4dcb81afd0
parent00a7010871e389e871fa830423f2109ca8a06770 (diff)
downloadmeson-75e6f33bb7a93f2caea4698c32ccd73169471349.zip
meson-75e6f33bb7a93f2caea4698c32ccd73169471349.tar.gz
meson-75e6f33bb7a93f2caea4698c32ccd73169471349.tar.bz2
Fix install locations.
-rwxr-xr-xinstall_meson.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/install_meson.py b/install_meson.py
index 1b691d5..b80ac70 100755
--- a/install_meson.py
+++ b/install_meson.py
@@ -48,7 +48,7 @@ else:
install_root = os.path.join(options.destdir, options.prefix[1:])
script_dir = os.path.join(install_root, 'share/meson-' + version)
-bin_dir = os.path.join(install_root, 'bin')
+bin_dir = os.path.join(install_root, 'usr/bin')
bin_script = os.path.join(script_dir, 'meson.py')
gui_script = os.path.join(script_dir, 'mesongui.py')
bin_name = os.path.join(bin_dir, 'meson')
@@ -56,6 +56,8 @@ gui_name = os.path.join(bin_dir, 'mesongui')
man_dir = os.path.join(install_root, 'share/man/man1')
in_manfile = 'man/meson.1'
out_manfile = os.path.join(man_dir, 'meson.1.gz')
+in_guimanfile = 'man/mesongui.1'
+out_guimanfile = os.path.join(man_dir, 'mesongui.1.gz')
symlink_value = os.path.relpath(bin_script, os.path.dirname(bin_name))
guisymlink_value = os.path.relpath(gui_script, os.path.dirname(gui_name))
@@ -84,3 +86,4 @@ os.symlink(symlink_value, bin_name)
os.symlink(guisymlink_value, gui_name)
print('Installing manfile to %s.' % man_dir)
open(out_manfile, 'wb').write(gzip.compress(open(in_manfile, 'rb').read()))
+open(out_guimanfile, 'wb').write(gzip.compress(open(in_guimanfile, 'rb').read()))