--- Makefile.in
+++ Makefile.in
@@ -48,3 +48,3 @@
   install-shlibs-libs-recursive install-doc-libs
-	if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi
+	$(MAKE) install-libs
 
--- e2fsck/Makefile.in
+++ e2fsck/Makefile.in
@@ -163,6 +163,6 @@
 	@echo "	LINK $(root_sbindir)/fsck.ext2"
-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+	@$(LN_S) -f e2fsck \
 			$(DESTDIR)$(root_sbindir)/fsck.ext2
 	@echo "	LINK $(root_sbindir)/fsck.ext3"
-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+	@$(LN_S) -f e2fsck \
 			$(DESTDIR)$(root_sbindir)/fsck.ext3
@@ -176,6 +176,6 @@
 	@echo "	LINK $(man8dir)/fsck.ext2.8"
-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+	@$(LN_S) -f e2fsck.8 \
 		$(DESTDIR)$(man8dir)/fsck.ext2.8
 	@echo "	LINK $(man8dir)/fsck.ext3.8"
-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+	@$(LN_S) -f e2fsck.8 \
 		$(DESTDIR)$(man8dir)/fsck.ext3.8
--- misc/Makefile.in
+++ misc/Makefile.in
@@ -228,12 +228,12 @@
 	@echo "	LINK $(root_sbindir)/mkfs.ext2"
-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+	@$(LN_S) -f mke2fs \
 		$(DESTDIR)$(root_sbindir)/mkfs.ext2
 	@echo "	LINK $(root_sbindir)/mkfs.ext3"
-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+	@$(LN_S) -f mke2fs \
 		$(DESTDIR)$(root_sbindir)/mkfs.ext3
 	@echo "	LINK $(root_sbindir)/e2label"
-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+	@$(LN_S) -f tune2fs \
 		$(DESTDIR)$(root_sbindir)/e2label
 	@echo "	LINK $(root_sbindir)/findfs"
-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+	@$(LN_S) -f tune2fs \
 		$(DESTDIR)$(root_sbindir)/findfs
@@ -257,6 +257,6 @@
 	@echo "	LINK mkfs.ext2.8"
-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+	@$(LN_S) -f mke2fs.8 \
 		$(DESTDIR)$(man8dir)/mkfs.ext2.8
 	@echo "	LINK mkfs.ext3.8"
-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+	@$(LN_S) -f mke2fs.8 \
 		$(DESTDIR)$(man8dir)/mkfs.ext3.8
--- lib/uuid/Makefile.in
+++ lib/uuid/Makefile.in
@@ -148,5 +148,5 @@
 	@echo "	LINK $(man3dir)/uuid_generate_random.3"
-	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+	@$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
 	@echo "	LINK $(man3dir)/uuid_generate_time.3"
-	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
+	@$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
 	@echo "	INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
--- lib/Makefile.elf-lib
+++ lib/Makefile.elf-lib
@@ -26,7 +26,7 @@
 
 $(ELF_LIB): $(OBJS)
 	@echo "	GEN_ELF_SOLIB $(ELF_LIB)"
-	@(cd elfshared; $(CC) --shared -o $(ELF_LIB) \
+	@(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
 		-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
 	@$(MV) elfshared/$(ELF_LIB) .
 	@$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
@@ -49,3 +49,3 @@
 	@echo "	SYMLINK $(libdir)/$(ELF_IMAGE).so"
-	@$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+	@$(LN_S) -f $(ELF_SONAME) \
 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
--- util/Makefile.in
+++ util/Makefile.in
@@ -15,7 +15,7 @@
 
 .c.o:
 	@echo "	CC $<"
-	@$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@
+	@$(BUILD_CC) -c $(DEFS) $< -o $@
 
 PROGS=		subst
 
@@ -23,11 +23,11 @@
 
 subst: subst.o
 	@echo "	LD $@"
-	@$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o
+	@$(BUILD_CC) -o subst subst.o
 
 copy_sparse: copy_sparse.o
 	@echo "	LD $@"
-	@$(BUILD_CC) $(ALL_LDFLAGS) -o copy_sparse copy_sparse.o
+	@$(BUILD_CC) -o copy_sparse copy_sparse.o
 
 gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
 	@echo "	CONFIG.STATUS $@"