Some missing DESTDIRs.

diff --git a/dmsetup/Makefile.in b/dmsetup/Makefile.in
index a0c6b6010748c945ec37b42dd9e90f82e2ec2b16..30cda0d6519cd3b07c85127f9029e2944a510158 100644 (file)
--- a/dmsetup/Makefile.in
+++ b/dmsetup/Makefile.in
@@ -13,8 +13,11 @@ TARGETS=dmsetup
 
 include ../make.tmpl
 
-dmsetup: $(OBJECTS)
-       $(CC) -o dmsetup dmsetup.o $(LD_FLAGS) -ldevmapper
+dmsetup: $(OBJECTS) $(interfacedir)/libdevmapper.so \
+        $(interfacedir)/libdevmapper.a
+       $(CC) -o dmsetup $(OBJECTS) $(LD_FLAGS) \
+             -L$(interfacedir) -L$(DESTDIR)/lib $(LIBS) \
+             -ldevmapper
 
 install: dmsetup
        $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<

diff --git a/make.tmpl.in b/make.tmpl.in
index cc210948196bca2a6d68fd12a7853c862a0915cc..0a948b009f6a2ecb17b010c12c568d079f7e9cc4 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -79,6 +79,10 @@ LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \
 
 INCLUDES+=-I. -I$(top_srcdir)/include
 
+ifdef DESTDIR
+  INCLUDES+=-I$(DESTDIR)/usr/include
+endif
+
 ifneq ("@missingkernel@", "yes")
   INCLUDES+=-I$(kerneldir)/include
 endif
@@ -134,10 +138,8 @@ $(TARGETS): $(OBJECTS)
 
 %.d: %.c
        set -e; \
-       FILE=`echo $@ | \
-               sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
-       DEPS=`echo $(DEPS) | \
-               sed -e 's/\\//\\\\\\//g'`; \
+       FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
+       DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \
        $(CC) -MM $(INCLUDES) $(CFLAGS) $< | \
        sed "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d : $$DEPS /g" > $@; \
                [ -s $@ ] || $(RM) $@