From: David Zeuthen <davidz@redhat.com>
Date: Mon, 23 Apr 2012 17:35:38 +0000 (-0400)
Subject: Fix 'make distcheck'
X-Git-Tag: upstream/2.1.2~285
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f01be914bccfbff18c18741b8bb4b841662e6aae;p=platform%2Fupstream%2Fudisks2.git

Fix 'make distcheck'

Signed-off-by: David Zeuthen <davidz@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index 1c05d10..cb92521 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = 			\
 DISTCHECK_CONFIGURE_FLAGS=							\
 	--enable-gtk-doc 							\
 	--disable-introspection							\
+	--with-udevdir=$$dc_install_base/$(udevdir)				\
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)	\
 	$(NULL)
 
diff --git a/configure.ac b/configure.ac
index 099b8fc..e2ba058 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,11 @@ AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
 AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)
 
 # udevdir
-udevdir=$($PKG_CONFIG --variable=udevdir udev)
-AC_SUBST(udevdir)
+AC_ARG_WITH([udevdir],
+            AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]),
+            [],
+            [with_udevdir=$($PKG_CONFIG --variable=udevdir udev)])
+AC_SUBST([udevdir], [$with_udevdir])
 
 # systemd
 AC_ARG_WITH([systemdsystemunitdir],
diff --git a/udisks/Makefile.am b/udisks/Makefile.am
index 8f23453..efd1627 100644
--- a/udisks/Makefile.am
+++ b/udisks/Makefile.am
@@ -50,8 +50,8 @@ dbus_built_sources =									\
 	udisks-generated.h			udisks-generated.c			\
 	$(NULL)
 
-udisksversion.h: udisksversion.h.in
-	   sed -e 's/@MAJOR_VERSION@/$(UDISKS_MAJOR_VERSION)/' -e 's/@MINOR_VERSION@/$(UDISKS_MINOR_VERSION)/' -e 's/@MICRO_VERSION@/$(UDISKS_MICRO_VERSION)/' udisksversion.h.in > udisksversion.h.tmp && mv udisksversion.h.tmp udisksversion.h
+udisksversion.h: $(top_srcdir)/udisks/udisksversion.h.in
+	   sed -e 's/@MAJOR_VERSION@/$(UDISKS_MAJOR_VERSION)/' -e 's/@MINOR_VERSION@/$(UDISKS_MINOR_VERSION)/' -e 's/@MICRO_VERSION@/$(UDISKS_MICRO_VERSION)/' $(top_srcdir)/udisks/udisksversion.h.in > udisksversion.h.tmp && mv udisksversion.h.tmp udisksversion.h
 
 BUILT_SOURCES =										\
 	$(enum_built_sources)								\