From 423774519754823b915bcf44721a08e85f3848ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Fri, 26 Mar 2021 02:05:10 +0000
Subject: [PATCH] Add --include-controldir.

---
 ognibuild/debian/file_search.py | 1 +
 ognibuild/dist.py               | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ognibuild/debian/file_search.py b/ognibuild/debian/file_search.py
index 21c570f..429852e 100644
--- a/ognibuild/debian/file_search.py
+++ b/ognibuild/debian/file_search.py
@@ -286,6 +286,7 @@ GENERATED_FILE_SEARCHER = GeneratedFileSearcher(
         "/usr/bin/rst2html": "python3-docutils",
         # aclocal is a symlink to aclocal-1.XY
         "/usr/bin/aclocal": "automake",
+        "/usr/bin/automake": "automake",
         # maven lives in /usr/share
         "/usr/bin/mvn": "maven",
     }
diff --git a/ognibuild/dist.py b/ognibuild/dist.py
index b7c56c9..ce8bcdc 100644
--- a/ognibuild/dist.py
+++ b/ognibuild/dist.py
@@ -146,6 +146,9 @@ if __name__ == "__main__":
         "--target-directory", type=str, default="..", help="Target directory"
     )
     parser.add_argument("--verbose", action="store_true", help="Be verbose")
+    parser.add_argument(
+        '--include-controldir', action='store_true',
+        help='Clone rather than export.')
 
     args = parser.parse_args()
 
@@ -172,6 +175,7 @@ if __name__ == "__main__":
             target_dir=os.path.abspath(args.target_directory),
             packaging_tree=packaging_tree,
             chroot=args.chroot,
+            include_controldir=args.include_controldir,
         )
     except (NoBuildToolsFound, NotImplementedError):
         logging.info("No build tools found, falling back to simple export.")