diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-21 02:04:32 +0300 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-21 02:04:32 +0300 |
| commit | 51a68380480ec8ab092dc57e6ced6d8a51084ba6 (patch) | |
| tree | 7e2651d4e84aa81445320259f14d0f684354173d /modules | |
| parent | a7cd29c74b68d34db9066bdfa8a24be1cd8e4667 (diff) | |
| download | meson-51a68380480ec8ab092dc57e6ced6d8a51084ba6.zip meson-51a68380480ec8ab092dc57e6ced6d8a51084ba6.tar.gz meson-51a68380480ec8ab092dc57e6ced6d8a51084ba6.tar.bz2 | |
modules/rpm: own directories for subdirs in headers
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/rpm.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/rpm.py b/modules/rpm.py index 97e50bd..5e421cb 100644 --- a/modules/rpm.py +++ b/modules/rpm.py @@ -63,9 +63,11 @@ class RPMModule: mlog.log('Warning, removing', mlog.bold(target.get_filename()), 'from package because packaging static libs not recommended') for header in state.headers: - for hdr_src in header.get_sources(): - files_devel.append('%%{_includedir}/%s' % os.path.join( - header.get_install_subdir(), hdr_src)) + if len(header.get_install_subdir()) > 0: + files_devel.append('%%{_includedir}/%s/' % header.get_install_subdir()) + else: + for hdr_src in header.get_sources(): + files_devel.append('%%{_includedir}/%s' % hdr_src) if len(files_devel) > 0: devel_subpkg = True fn = open('%s.spec' % os.path.join(state.environment.get_build_dir(), proj), |