mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Avoid referencing files from DESTDIR during build process
This commit is contained in:
parent
beeae21dbb
commit
9bcd5c2ffc
@ -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.
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user