ChangeLog, MCONFIG.in:
  MCONFIG.in (DEPLIBUUID): Since LIBUUID can sometimes include
  	"-lsocket" we need a separate DEPLIBUUID that can be used in
  	Makefile's dependency rules.
ChangeLog, Makefile.in:
  Makefile.in: Since LIBUUID can sometimes include "-lsocket" we need a
  	separate DEPLIBUUID that can be used in Makefile's dependency rules.

diff --git a/MCONFIG.in b/MCONFIG.in
index 8c10d38..6ce7a5a 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -57,18 +57,21 @@
 LIBE2P = $(LIB)/libe2p@LIB_EXT@
 LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
 LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ 
+DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
 
 STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
 STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
 STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
 STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
 STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
+DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
 
 PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
 PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
 PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
 PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
 PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@ 
+DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@
 
 #
 # Use these definitions is you use tools 2.x, x < 16
@@ -94,7 +97,7 @@
 DEP_SUBSTITUTE= $(top_builddir)/util/subst $(SUBST_CONF)
 
 $(top_builddir)/util/subst:
-	$(MAKE) -C $(top_builddir)/util subst
+	(cd $(top_builddir)/util ; $(MAKE) subst)
 
 #
 # Warning flags