diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 20:26:31 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 20:26:31 +0300 |
| commit | 16e032c2890487f56cf8cffdf7b0c241482116be (patch) | |
| tree | 85b3fd0d25ce1b055070f330d6f89310b2990cc2 | |
| parent | a6712b7f205a578cff5aa674f0d9b9cd82d90115 (diff) | |
| download | meson-16e032c2890487f56cf8cffdf7b0c241482116be.zip meson-16e032c2890487f56cf8cffdf7b0c241482116be.tar.gz meson-16e032c2890487f56cf8cffdf7b0c241482116be.tar.bz2 | |
Fix installing manpages from subdirs.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 3 | ||||
| -rw-r--r-- | test cases/common/10 man install/installed_files.txt | 1 | ||||
| -rw-r--r-- | test cases/common/10 man install/meson.build | 1 | ||||
| -rw-r--r-- | test cases/common/10 man install/vanishing/vanishing.2 | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3bec19d..7a6d579 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -525,8 +525,9 @@ int dummy; if subdir is None: subdir = os.path.join(manroot, 'man' + num) srcabs = os.path.join(self.environment.get_source_dir(), m.get_source_subdir(), f) - dstabs = os.path.join(subdir, f + '.gz') + dstabs = os.path.join(subdir, os.path.split(f)[1] + '.gz') i = [srcabs, dstabs] + print(i) d.man.append(i) def generate_data_install(self, d): diff --git a/test cases/common/10 man install/installed_files.txt b/test cases/common/10 man install/installed_files.txt index 29331e4..7b19616 100644 --- a/test cases/common/10 man install/installed_files.txt +++ b/test cases/common/10 man install/installed_files.txt @@ -1,3 +1,4 @@ usr/share/man/man1/foo.1.gz usr/share/man/man2/bar.2.gz usr/share/man/man1/vanishing.1.gz +usr/share/man/man2/vanishing.2.gz diff --git a/test cases/common/10 man install/meson.build b/test cases/common/10 man install/meson.build index 1c93036..8436fa5 100644 --- a/test cases/common/10 man install/meson.build +++ b/test cases/common/10 man install/meson.build @@ -1,4 +1,5 @@ project('man install', 'c') m1 = install_man('foo.1') m2 = install_man('bar.2') +install_man('vanishing/vanishing.2') subdir('vanishing') diff --git a/test cases/common/10 man install/vanishing/vanishing.2 b/test cases/common/10 man install/vanishing/vanishing.2 new file mode 100644 index 0000000..d12f76a --- /dev/null +++ b/test cases/common/10 man install/vanishing/vanishing.2 @@ -0,0 +1 @@ +This is a second man page of the vanishing subdirectory. |