From: Karel Zak <kzak@redhat.com>
Date: Wed, 18 Mar 2009 14:45:48 +0000 (+0100)
Subject: build-sys: fix bugs detected by "make distcheck"
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d2802a0dbbd76d119a3217774233557edbfcf98;p=util-linux

build-sys: fix bugs detected by "make distcheck"

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index 72a0a829..8fea6fa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ checkconfig:
 		| xargs $(top_srcdir)/tools/checkconfig.sh $(top_srcdir)
 
 
-ENABLE_ALL = --enable-static-programs \
+ENABLE_ALL = --enable-static-programs --with-fsprobe=builtin \
  --enable-elvtune --enable-init --enable-kill --enable-last \
  --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
  --enable-login-utils --enable-write --enable-arch --enable-mount
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 9a0497ea..b42a0c3a 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -16,9 +16,9 @@ dist_noinst_DATA = $(dist_man_MANS)
 
 # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
 #
-ul_libblkid_srcdir = $(top_builddir)/libs/blkid/src
-ul_libblkid_la = $(ul_libblkid_srcdir)/libblkid.la
+ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
+ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
 
 $(ul_libblkid_la):
-	$(MAKE) -C $(ul_libblkid_srcdir)
+	$(MAKE) -C $(ul_libblkid_builddir)
 
diff --git a/libs/blkid/src/Makefile.am b/libs/blkid/src/Makefile.am
index c1a441eb..61a7ca06 100644
--- a/libs/blkid/src/Makefile.am
+++ b/libs/blkid/src/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 SUBDIRS = probers .
 
-AM_CPPFLAGS += -I$(top_builddir)/libs/blkid/src
+AM_CPPFLAGS += -I$(top_srcdir)/libs/blkid/src
 
 common_ldadd =
 
@@ -28,7 +28,10 @@ libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c  \
 libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
 libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym
 
-libblkid_la_LDFLAGS = -Wl,--version-script=blkid.sym -version-info @BLKID_VERSION_INFO@
+# TODO: for unknown reason "make distcheck" requires
+#       full path to the version string
+libblkid_la_LDFLAGS = -Wl,--version-script=$(top_srcdir)/libs/blkid/src/blkid.sym \
+                      -version-info @BLKID_VERSION_INFO@
 
 tests = test_cache test_config test_dev test_devname test_devno test_getsize \
 	test_read test_resolve test_save test_tag test_verify test_evaluate
diff --git a/libs/blkid/src/probers/Makefile.am b/libs/blkid/src/probers/Makefile.am
index 9de23168..2f5a79da 100644
--- a/libs/blkid/src/probers/Makefile.am
+++ b/libs/blkid/src/probers/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-AM_CPPFLAGS += -I$(top_builddir)/libs/blkid/src
+AM_CPPFLAGS += -I$(top_srcdir)/libs/blkid/src
 
 noinst_LTLIBRARIES = libblkid_probers.la
 libblkid_probers_la_SOURCES = \