mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
no DMDIR
This commit is contained in:
parent
47ba0ed497
commit
0f2c248eee
@ -611,12 +611,6 @@ AC_ARG_WITH(staticdir,
|
|||||||
[ STATICDIR="$withval" ],
|
[ STATICDIR="$withval" ],
|
||||||
[ STATICDIR='${exec_prefix}/sbin' ])
|
[ STATICDIR='${exec_prefix}/sbin' ])
|
||||||
|
|
||||||
# Convert a relative dir name to absolute.
|
|
||||||
case $DMDIR in
|
|
||||||
/*) ;;
|
|
||||||
*) DMDIR="`pwd`/$DMDIR" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_ARG_WITH(usrlibdir,
|
AC_ARG_WITH(usrlibdir,
|
||||||
[ --with-usrlibdir=DIR],
|
[ --with-usrlibdir=DIR],
|
||||||
[ usrlibdir="$withval"],
|
[ usrlibdir="$withval"],
|
||||||
@ -723,7 +717,6 @@ AC_SUBST(COPTIMISE_FLAG)
|
|||||||
AC_SUBST(CSCOPE_CMD)
|
AC_SUBST(CSCOPE_CMD)
|
||||||
AC_SUBST(DEBUG)
|
AC_SUBST(DEBUG)
|
||||||
AC_SUBST(DEVMAPPER)
|
AC_SUBST(DEVMAPPER)
|
||||||
AC_SUBST(DMDIR)
|
|
||||||
AC_SUBST(DMEVENTD)
|
AC_SUBST(DMEVENTD)
|
||||||
AC_SUBST(DM_COMPAT)
|
AC_SUBST(DM_COMPAT)
|
||||||
AC_SUBST(DM_DEVICE_GID)
|
AC_SUBST(DM_DEVICE_GID)
|
||||||
|
11
make.tmpl.in
11
make.tmpl.in
@ -80,13 +80,6 @@ ifeq ("@INTL@", "yes")
|
|||||||
DEFS += -DINTL_PACKAGE=\"@INTL_PACKAGE@\" -DLOCALEDIR=\"@LOCALEDIR@\"
|
DEFS += -DINTL_PACKAGE=\"@INTL_PACKAGE@\" -DLOCALEDIR=\"@LOCALEDIR@\"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ("@DMDIR@", "")
|
|
||||||
LDFLAGS += -L@DMDIR@/lib/ioctl
|
|
||||||
ifeq ("@DMEVENTD@", "yes")
|
|
||||||
LDFLAGS += -L@DMDIR@/dmeventd
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
LDFLAGS += -L$(top_srcdir)/lib -L$(libdir)
|
LDFLAGS += -L$(top_srcdir)/lib -L$(libdir)
|
||||||
|
|
||||||
#DEFS += -DDEBUG_POOL
|
#DEFS += -DDEBUG_POOL
|
||||||
@ -105,10 +98,6 @@ LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \
|
|||||||
|
|
||||||
INCLUDES += -I$(top_srcdir)/include
|
INCLUDES += -I$(top_srcdir)/include
|
||||||
|
|
||||||
ifneq ("@DMDIR@", "")
|
|
||||||
INCLUDES += -I@DMDIR@/include
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef DESTDIR
|
ifdef DESTDIR
|
||||||
INCLUDES += -I$(DESTDIR)/usr/include
|
INCLUDES += -I$(DESTDIR)/usr/include
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user