Fix build issue

* use --libdir to fix issue with .la files which had //lib as lib folder
* add libblkid as library

modules/cryptsetup

@@ -14,7 +14,8 @@ cryptsetup_configure := ./configure \
 	$(CROSS_TOOLS) \
 	--host i386-elf-linux \
 	--prefix "/" \
-	--disable-rpath \
+	--disable-gcrypt-pbkdf2 \
+	--enable-cryptsetup-reencrypt \
 	--with-crypto_backend=kernel \
 
 # but after building, replace prefix so that they will be installed
@@ -47,10 +48,12 @@ json-c_hash := 99914e644a25201d82ccefa20430f7515c110923360f9ef46755527c02412afa
 
 # there is a bug in cmake-configure so that it can not be used with a "=", fxed in next
 # release though (then it needs to read '--prefix="$(INSTALL)"' here instead
-json-c_configure := mkdir build && \
+json-c_configure := mkdir -p build && \
 	cd build && \
 	../cmake-configure --prefix "$(INSTALL)"
 
-json-c_target := $(CROSS_TOOLS) -C $(build)/$(json-c_dir)/build all install
+json-c_target := \
+	$(CROSS_TOOLS) -C $(build)/$(json-c_dir)/build \
+	all install
 
-json-c_libraries := build/libjson-c.so.5.0.0
+json-c_libraries := build/.libs/libjson-c.so.5.0.0

modules/util-linux

@@ -28,9 +28,8 @@ util-linux_target := \
 	DESTDIR="$(INSTALL)" \
 	install
 
-util-linux_libraries += .libs/libuuid.so.1
-
-# libblkid is not needed by lvm2, so it is not installed now
-#util-linux_libraries += .libs/libblkid.so.1
+util-linux_libraries += \
+	.libs/libuuid.so.1 \
+	.libs/libblkid.so.1 \
 
 util-linux_depends := $(musl_dep)