$OpenBSD: patch-MCONFIG_in,v 1.3 2010/04/03 11:53:58 kili Exp $
--- MCONFIG.in.orig	Sat Nov 15 18:17:22 2008
+++ MCONFIG.in	Fri Apr  2 21:44:32 2010
@@ -70,34 +70,40 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 # Library definitions
 #
 LIB = $(top_builddir)/lib
-LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
-LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
-LIBE2P = $(LIB)/libe2p@LIB_EXT@
-LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
-LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@
-LIBBLKID = $(LIB)/libblkid@LIB_EXT@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
+LIBSS = -L$(LIB) -lss
+LIBCOM_ERR = -L$(LIB) -lext2fs_com_err
+LIBE2P = -L$(LIB) -le2p
+LIBEXT2FS = -L$(LIB) -lext2fs
+LIBUUID = -L$(LIB) -le2fs-uuid @SOCKET_LIB@
+LIBBLKID = -L$(LIB) -lblkid $(LIBUUID)
 LIBINTL = @LIBINTL@
 DEPLIBSS = $(LIB)/libss@LIB_EXT@
-DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
+DEPLIBE2P= $(LIB)/libe2p@LIB_EXT@
+DEPLIBEXT2FS= $(LIB)/libext2fs@LIB_EXT@
+DEPLIBCOM_ERR= $(LIB)/libext2fs_com_err@LIB_EXT@
+DEPLIBUUID = $(LIB)/libe2fs-uuid@LIB_EXT@
 DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
 
 STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ @DLOPEN_LIB@
-STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@
+STATIC_LIBCOM_ERR = $(LIB)/libext2fs_com_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@
 STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
 STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
-STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
+STATIC_LIBUUID = $(LIB)/libe2fs-uuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
 STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_LIBUUID)
+DEPSTATIC_LIBEXT2FS= $(LIB)/libext2fs@STATIC_LIB_EXT@
+DEPSTATIC_LIBE2P= $(LIB)/libe2p@STATIC_LIB_EXT@
+DEPSTATIC_LIBCOM_ERR= $(LIB)/libext2fs_com_err@STATIC_LIB_EXT@
 DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
-DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
+DEPSTATIC_LIBUUID = $(LIB)/libe2fs-uuid@STATIC_LIB_EXT@
 DEPSTATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@
 
 PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ @DLOPEN_LIB@
-PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@
+PROFILED_LIBCOM_ERR = $(LIB)/libext2fs_com_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@
 PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
 PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
-PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@ 
+PROFILED_LIBUUID = $(LIB)/libe2fs-uuid@PROFILED_LIB_EXT@ @SOCKET_LIB@ 
 PROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@ $(PROFILED_LIBUUID)
-DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@
+DEPPROFILED_LIBUUID = $(LIB)/libe2fs-uuid@PROFILED_LIB_EXT@
 DEPPROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@
 
 # An include directive pointing to a directory holding enough linux-like