tests: more tolerable makefile

diff --git a/test/Makefile.in b/test/Makefile.in
index 48ecdd7121dcf47ced346a8f778ad91e16458508..39093bf09add7aad02dd3cae7f683d99aa6736e9 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -239,7 +239,7 @@ LIB_LVMLOCKD_CONF = \
  test-dlm-conf \
  test-sanlock-conf
 
-LIB_LOCAL = paths runner
+LIB_LOCAL = paths runner mke2fs.conf
 LIB_NOT = not
 LIB_LINK_NOT = invalid fail should
 LIB_SHARED = check aux inittest utils get lvm-wrapper
@@ -250,8 +250,8 @@ install: .tests-stamp lib/paths-installed
        $(INSTALL_DATA) shell/*.sh $(DATADIR)/shell
        $(INSTALL_DATA) unit/*.sh $(DATADIR)/unit
        $(INSTALL_DATA) lib/mke2fs.conf $(DATADIR)/lib
-       $(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit
-       $(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/
+       -$(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit
+       -$(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/
        $(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths
        cd lib && $(INSTALL_DATA) \
                $(LIB_FLAVOURS) \
@@ -340,6 +340,9 @@ lib/version-expected: $(top_srcdir)/VERSION .lib-dir-stamp
 lib/dm-version-expected: $(top_srcdir)/VERSION_DM .lib-dir-stamp
        cut -f 1 -d ' ' <$< >$@
 
+lib/mke2fs.conf: $(srcdir)/lib/mke2fs.conf
+       $(LN_S) -f $< $@
+
 CMDS = lvm $(shell cat $(top_builddir)/tools/.commands 2>/dev/null)
 LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $(LIB_FLAVOURS))