From 30ee10437b3463cf27a092a0c533ad9f7466e75d Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 2 Nov 2021 00:03:23 +0100 Subject: 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). --- configure.ac | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.ac') 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 -- cgit v1.2.1