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 2a2b21c29e8ce33724023ce2dca4088f4c46663c..69683b01edae115631ba44535bcd4192fe21cdb9 100644 (file)
--- 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 624483122a3cfa484dc9c70281c00964206d7ef5..6a5eab1bc72c4beef84abc76a4857f0fc972998f 100644 (file)
--- 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>