more build fixes

diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in
index 2ee872843007d5294a1b54bd282180c86c0b9430..d1852050b76b895ac969e84c929070ebe7fbfae9 100644 (file)
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -64,8 +64,8 @@ dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
        $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
        $(LVMLIBS) $(LIBS) -rdynamic
 
-dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacedir)/libdevmapper.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacedir) -o $@ \
+dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
        dmeventd.o $(LVMLIBS) $(LIBS) -rdynamic
 
 ifeq ("@PKGCONFIG@", "yes")

diff --git a/libdm/misc/dm-log-userspace.h b/libdm/misc/dm-log-userspace.h
index 8a1f972c0fe97a0ceaf4fa8b6c99f1d42ac84d33..9f71f4b87c3fcfaf1c4592e3ab0d64b26fe83e06 100644 (file)
--- a/libdm/misc/dm-log-userspace.h
+++ b/libdm/misc/dm-log-userspace.h
@@ -7,7 +7,7 @@
 #ifndef __DM_LOG_USERSPACE_H__
 #define __DM_LOG_USERSPACE_H__
 
-#include <linux/dm-ioctl.h> /* For DM_UUID_LEN */
+#include "dm-ioctl.h" /* For DM_UUID_LEN */
 
 /*
  * The device-mapper userspace log module consists of a kernel component and

diff --git a/make.tmpl.in b/make.tmpl.in
index a6e16de7e22b5f5d106f6140544c3d4341a83ea1..1c3834ec3fb3a9173aff990e67cbaf8aeb8175ae 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -54,7 +54,7 @@ staticdir = $(DESTDIR)@STATICDIR@
 udevdir = $(DESTDIR)@udevdir@
 
 interface = @interface@
-interfacedir = $(top_srcdir)/libdm/$(interface)
+interfacebuilddir = $(top_builddir)/libdm/$(interface)
 
 # setup misc variables
 # define the ownership variables for the binaries and man pages

diff --git a/tools/Makefile.in b/tools/Makefile.in
index fc5faad6aa16aa3581a628f01982ea85781794c4..b650c67f24e44c04e144281b6c1ccc2012f2f753 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -115,8 +115,8 @@ dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
        $(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
              -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
 
-dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) \
+dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
              -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
 
 all: device-mapper
@@ -125,8 +125,8 @@ lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) lvm.o \
                $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
 
-lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacedir)/libdevmapper.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -o $@ \
+lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
              $(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) \
              -rdynamic