aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2017-07-04 10:23:14 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2017-08-01 11:40:28 +0100
commit36e58e88650f0ef51cdee37ec7a593893298cadf (patch)
treea379e1b29d40adc1ada378f8089a9952a23a75aa
parent0ed0bcce4902db366d74a52794f7e71e73a47d41 (diff)
downloadmeson-36e58e88650f0ef51cdee37ec7a593893298cadf.zip
meson-36e58e88650f0ef51cdee37ec7a593893298cadf.tar.gz
meson-36e58e88650f0ef51cdee37ec7a593893298cadf.tar.bz2
meson_install: rename 'data' to 'd' for consistency
All other functions call it 'd', let's do it here too
-rw-r--r--mesonbuild/scripts/meson_install.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index d4449c9..35904ea 100644
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -152,13 +152,13 @@ def do_install(datafilename):
install_data(d)
run_install_script(d)
-def install_subdirs(data):
- for (src_dir, inst_dir, dst_dir, mode) in data.install_subdirs:
+def install_subdirs(d):
+ for (src_dir, inst_dir, dst_dir, mode) in d.install_subdirs:
if src_dir.endswith('/') or src_dir.endswith('\\'):
src_dir = src_dir[:-1]
src_prefix = os.path.join(src_dir, inst_dir)
print('Installing subdir %s to %s' % (src_prefix, dst_dir))
- dst_dir = get_destdir_path(data, dst_dir)
+ dst_dir = get_destdir_path(d, dst_dir)
if not os.path.exists(dst_dir):
os.makedirs(dst_dir)
do_copydir(src_prefix, src_dir, dst_dir)