opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
edge.strict_endians
Erik Larsson 2011-07-06 12:41:19 +02:00
parent fd71e36096
commit 277c8c8cdf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ntfsprogs/Makefile.am
View File

@ -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.