diff options
| author | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-11-30 13:04:28 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2019-11-30 13:04:28 +0100 |
| commit | c2dbe35347be89f77261bd3ebba253d27bfa4be6 (patch) | |
| tree | 396c17c3215bca2425650ef01874bf73b633b704 /pygnulib/GLModuleSystem.py | |
| parent | 82e12f20ef88be6335617d7c0077cc66d81acfca (diff) | |
| download | gnulib-c2dbe35347be89f77261bd3ebba253d27bfa4be6.tar.gz | |
gnulib-tool.py: Fix libgnu_la_LDFLAGS section in generated Makefile.am.
Reported by Dagobert Michelsen <dam@opencsw.org> in
<https://lists.gnu.org/archive/html/bug-gnulib/2019-11/msg00086.html>.
* pygnulib/GLModuleSystem.py (getLink): Don't join the parts. Return a
list of strings instead of one string.
* pygnulib/GLEmiter.py (lib_Makefile_am): Adapt accordingly.
* pygnulib/GLImport.py (execute): Likewise.
Diffstat (limited to 'pygnulib/GLModuleSystem.py')
| -rw-r--r-- | pygnulib/GLModuleSystem.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index f2f9df4ac9..9560bc2731 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -791,13 +791,11 @@ Include:|Link:|License:|Maintainer:)' Return link directive.''' section = 'Link:' if 'link' not in self.cache: - if section not in self.content: - result = string() - else: # if section in self.content + parts = list() + if section in self.content: snippet = self.content.split(section)[-1] snippet = snippet.replace('\r\n', '\n') lines = ['%s\n' % line for line in snippet.split('\n')] - parts = list() for line in lines: regex = '^(Description|Comment|Status|Notice|Applicability|' regex += 'Files|Depends-on|configure\\.ac-early|configure\\.ac|' @@ -808,8 +806,8 @@ Include:|Link:|License:|Maintainer:)' break parts += [line] parts = [part.strip() for part in parts if part.strip()] - result = ''.join(parts) - self.cache['link'] = result + # result = ' '.join(parts) + self.cache['link'] = parts return(self.cache['link']) def getLicense(self): |