From 01eaadfa53b163b3aa18e2581803276ff13b07cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20Kabel=C3=A1=C4=8D?= Date: Wed, 8 Apr 2009 14:08:05 +0000 Subject: [PATCH] Avoid referencing files from DESTDIR during build process --- WHATS_NEW | 3 ++- make.tmpl.in | 4 ---- tools/Makefile.in | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index eb86a3098..8b0bc649a 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,6 +1,7 @@ Version 2.02.46 - ================================ - Avoid creating some static libraries without static_link + Avoid referencing files from DESTDIR during build process. + Avoid creating some static libraries without static_link. Enable use of cached metadata for pvs and pvdisplay commands. Add missing 'device-mapper' internal subdir build dependency. Fix memory leak in mirror allocation code. diff --git a/make.tmpl.in b/make.tmpl.in index feb24626e..d5c2fa9cc 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -118,10 +118,6 @@ LIB_VERSION_DM := $(shell cat $(top_srcdir)/VERSION_DM | \ INCLUDES += -I. -I$(top_srcdir)/include -ifdef DESTDIR - INCLUDES += -I$(DESTDIR)/usr/include -endif - INC_LNS = $(top_srcdir)/include/.symlinks_created DEPS = $(top_srcdir)/make.tmpl $(top_srcdir)/VERSION Makefile $(INC_LNS) diff --git a/tools/Makefile.in b/tools/Makefile.in index fd67aff51..41e76aca6 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -103,11 +103,11 @@ device-mapper: dmsetup dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX) $(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \ - -L$(top_srcdir)/libdm -L$(DESTDIR)/lib -ldevmapper $(LIBS) + -L$(top_srcdir)/libdm -ldevmapper $(LIBS) dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a $(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \ - -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) \ + -L$(interfacedir) -ldevmapper $(LIBS) \ $(LIB_PTHREAD) all: device-mapper -- 2.43.5