From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 9 Jan 2014 20:59:29 +0000 (-0500)
Subject: util: fix make dependencies for subst
X-Git-Tag: v1.42.10~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2500ebfc89;p=thirdparty%2Fe2fsprogs.git

util: fix make dependencies for subst

Now that subst is using config.h, we need to fix its dependencies so
that if config.h is missing (i.e., after a "make clean" in the tree)
that it is rebuilt by the Makefile rule.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/util/Makefile.in b/util/Makefile.in
index 2a2b21c29..69683b01e 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -64,4 +64,4 @@ distclean: clean
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-subst.o: $(srcdir)/subst.c
+subst.o: $(srcdir)/subst.c $(top_builddir)/lib/config.h dirpaths.h
diff --git a/util/subst.c b/util/subst.c
index 624483122..6a5eab1bc 100644
--- a/util/subst.c
+++ b/util/subst.c
@@ -5,9 +5,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>