From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 7 Mar 2016 01:37:49 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2016-03-15~22
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=dcb8e1fa0452a3d31b678351c2297ad0255d3e4b;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

dcb8e1fa0452a3d31b678351c2297ad0255d3e4b
diff --cc Makefile.in
index a2e1756,f443fba..7da9ad7
--- a/Makefile.in
+++ b/Makefile.in
@@@ -34,6 -34,7 +34,7 @@@ subs: $(DEP_SUBSTITUTE
  		then $(MAKE) $$i || exit $$? ; fi ; done
  	@(if test -d lib/et ; then cd lib/et && $(MAKE) compile_et; fi)
  	@(if test -d lib/ext2fs ; then cd lib/ext2fs && $(MAKE) ext2_err.h; fi)
 -	@(if test -d e2fsck ; then cd e2fsck && $(MAKE) prof_err.h; fi)
++	@(if test -d lib/support ; then cd lib/support && $(MAKE) prof_err.h; fi)
  
  progs: all-progs-recursive
  libs: all-libs-recursive