changeset 39135:01e983399117

generator: fix subdirs for gnulib_comp
author Dmitry Selyutin <ghostmansd@gmail.com>
date Thu, 05 Jul 2018 22:25:36 +0300
parents e7bca471a0b8
children 25eedd702b46
files pygnulib.py pygnulib/generator.py
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pygnulib.py	Thu Jul 05 22:26:10 2018 +0300
+++ b/pygnulib.py	Thu Jul 05 22:25:36 2018 +0300
@@ -560,7 +560,6 @@
             "config": config,
             "explicit": explicit,
             "database": database,
-            "subdirs": True,
         }
         for line in gnulib_comp(**arguments):
             print(line, file=tmp)
--- a/pygnulib/generator.py	Thu Jul 05 22:26:10 2018 +0300
+++ b/pygnulib/generator.py	Thu Jul 05 22:25:36 2018 +0300
@@ -964,7 +964,7 @@
 
 
 
-def gnulib_comp(config, explicit, database, subdirs, **override):
+def gnulib_comp(config, explicit, database, **override):
     """gnulib-comp.m4 generator"""
     config = _BaseConfig(**config)
     for (key, value) in override.items():
@@ -973,6 +973,10 @@
     main_modules = database.main_modules
     test_modules = database.test_modules
 
+    subdirs = False
+    for module in database.main_modules:
+        subdirs |= any(__MAKEFILE_SUBDIRS.match(file) for file in module.files)
+
     date = _datetime.now()
     ac_file = config.ac_file
     yield "# DO NOT EDIT! GENERATED AUTOMATICALLY!"