From 51a68380480ec8ab092dc57e6ced6d8a51084ba6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 21 Mar 2015 02:04:32 +0300 Subject: modules/rpm: own directories for subdirs in headers Signed-off-by: Igor Gnatenko --- modules/rpm.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/rpm.py b/modules/rpm.py index 97e50bd91..5e421cb08 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), -- cgit v1.2.3