summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2021-11-02 00:03:23 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2021-11-07 22:28:48 +0100
commit30ee10437b3463cf27a092a0c533ad9f7466e75d (patch)
tree3c1b664985324b84a0da510ab2e31cd2c398048b /configure.ac
parente866cd22566427d33003e3544f3fd22633384f6f (diff)
downloadlibgphoto2-30ee10437b3463cf27a092a0c533ad9f7466e75d.tar.gz
Only use a single gphoto-m4/ subdir
Only use a single gphoto-m4/ subdir - namely that in libgphoto2_port/gphoto-m4/. This prevents us from needing to synchronize the contents of the gphoto-m4/ and the libgphoto2_port/gphoto-m4/ directories. We can do that by switching from recursive make for the gphoto-m4 subdirectories to using include path/to/gphoto-m4/Makefile-files from both the top-level Makefile.am and libgphoto2_port/Makefile.am using %reldir% (introduced in automake 1.14).
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index c876bd5b4..e1645a427 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,7 +665,6 @@ AC_CONFIG_FILES([
camlibs/Makefile
camlibs/canon/doc/Makefile
camlibs/konica/localization/Makefile
- gphoto-m4/Makefile
libgphoto2/Makefile
libgphoto2.pc
libgphoto2-uninstalled.pc