From 277c8c8cdf77c076c13b611b8be20e505b322b2b Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Wed, 6 Jul 2011 12:41:19 +0200 Subject: [PATCH] ntfsprogs/Makefile.am: Fix for conflicting usage of EXTRA_PROGRAMS. After the '--enable-extras' patch, EXTRA_PROGRAMS and bin_PROGRAMS were both defined when ENABLE_EXTRAS was enabled. This created a conflict, where at least automake 1.10 attempted to emit targets for the binaries twice, resulting in failure when running 'autogen.sh'. Conflict was resolved by defining the names of the binaries in a non-reserved variable EXTRA_PROGRAM_NAMES, which is then included either in EXTRA_PROGRAMS or bin_PROGRAMS but never in both. --- ntfsprogs/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index 18efcf46..e0758387 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -16,7 +16,7 @@ if ENABLE_NTFSPROGS bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls ntfscat ntfscmp sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone \ ntfscp -EXTRA_PROGRAMS = ntfsdump_logfile ntfswipe ntfstruncate ntfsmove \ +EXTRA_PROGRAM_NAMES = ntfsdump_logfile ntfswipe ntfstruncate ntfsmove \ ntfsmftalloc ntfsck man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ @@ -30,11 +30,13 @@ CLEANFILES = $(EXTRA_PROGRAMS) MAINTAINERCLEANFILES = Makefile.in if ENABLE_CRYPTO -EXTRA_PROGRAMS += ntfsdecrypt +EXTRA_PROGRAM_NAMES += ntfsdecrypt endif if ENABLE_EXTRAS -bin_PROGRAMS += $(EXTRA_PROGRAMS) +bin_PROGRAMS += $(EXTRA_PROGRAM_NAMES) +else +EXTRA_PROGRAMS = $(EXTRA_PROGRAM_NAMES) endif # Set the include path.