e1da3db508
- Remove MAINTAINERS as they agree not having time nor interest for it. - Use install-libs target instead of manually installing some cherrypicked headers - now all needed headers are installed in the right place. - Install fsck and its manpage as fsck_ext2fs instead of the confusing pfsck. - Install uuid.pc as e2fs-uuid.pc to avoid conflicts with devel/uuid. - Patch most Makefiles to print full build commands instead of the non-informative linux-kernel-like output. - Patch some regress tests, more and more works fine now. With feedback and tweaks from naddy@ and pea@
48 lines
2.2 KiB
Plaintext
48 lines
2.2 KiB
Plaintext
$OpenBSD: patch-MCONFIG_in,v 1.2 2009/03/15 19:59:31 landry Exp $
|
|
--- MCONFIG.in.orig Sat Nov 15 18:17:22 2008
|
|
+++ MCONFIG.in Sat Feb 21 17:00:02 2009
|
|
@@ -70,29 +70,35 @@ 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) -luuid @SOCKET_LIB@
|
|
+LIBBLKID = -L$(LIB) -lblkid $(LIBUUID)
|
|
LIBINTL = @LIBINTL@
|
|
DEPLIBSS = $(LIB)/libss@LIB_EXT@
|
|
+DEPLIBE2P= $(LIB)/libe2p@LIB_EXT@
|
|
+DEPLIBEXT2FS= $(LIB)/libext2fs@LIB_EXT@
|
|
+DEPLIBCOM_ERR= $(LIB)/libext2fs_com_err@LIB_EXT@
|
|
DEPLIBUUID = $(LIB)/libuuid@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_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_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@
|