summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WHATS_NEW1
-rw-r--r--doc/Makefile.in2
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/format1/Makefile.in2
-rw-r--r--lib/format_pool/Makefile.in2
-rw-r--r--lib/mirror/Makefile.in2
-rw-r--r--lib/snapshot/Makefile.in2
-rw-r--r--man/Makefile.in2
-rw-r--r--old-tests/device/Makefile.in2
-rw-r--r--old-tests/filters/Makefile.in2
-rw-r--r--old-tests/format1/Makefile.in2
-rw-r--r--old-tests/mm/Makefile.in2
-rw-r--r--old-tests/regex/Makefile.in2
-rw-r--r--po/Makefile.in2
14 files changed, 14 insertions, 13 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index e0765039..c72561a1 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.00.17 -
=============================
+ Tidy relative paths in makefile includes.
fsadm support for fsck and resizing - needs testing.
Add read-only GFS pool support.
Add lvm2create_initrd script from http://poochiereds.net/svn/lvm2/
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 39ff4e91..e5b773b3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -18,7 +18,7 @@ VPATH = @srcdir@
CONFSRC=example.conf
CONFDEST=lvm.conf
-include ../make.tmpl
+include $(top_srcdir)/make.tmpl
install:
@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index dd370ad3..f0da66e7 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -136,5 +136,5 @@ LIB_STATIC = liblvm.a
$(SUBDIRS): $(LIB_STATIC)
-include ../make.tmpl
+include $(top_srcdir)/make.tmpl
diff --git a/lib/format1/Makefile.in b/lib/format1/Makefile.in
index 924a87ca..bc5038d1 100644
--- a/lib/format1/Makefile.in
+++ b/lib/format1/Makefile.in
@@ -27,7 +27,7 @@ SOURCES =\
LIB_SHARED = liblvm2format1.so
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
.PHONY: install
diff --git a/lib/format_pool/Makefile.in b/lib/format_pool/Makefile.in
index 743a7b08..8476680b 100644
--- a/lib/format_pool/Makefile.in
+++ b/lib/format_pool/Makefile.in
@@ -24,7 +24,7 @@ SOURCES =\
LIB_SHARED = liblvm2formatpool.so
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
.PHONY: install
diff --git a/lib/mirror/Makefile.in b/lib/mirror/Makefile.in
index 66f33d50..edb56f16 100644
--- a/lib/mirror/Makefile.in
+++ b/lib/mirror/Makefile.in
@@ -20,7 +20,7 @@ SOURCES = mirrored.c
LIB_SHARED = liblvm2mirror.so
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
.PHONY: install
diff --git a/lib/snapshot/Makefile.in b/lib/snapshot/Makefile.in
index 87661613..9ae65195 100644
--- a/lib/snapshot/Makefile.in
+++ b/lib/snapshot/Makefile.in
@@ -20,7 +20,7 @@ SOURCES = snapshot.c
LIB_SHARED = liblvm2snapshot.so
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
.PHONY: install
diff --git a/man/Makefile.in b/man/Makefile.in
index 50a0a006..b8d76282 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -27,7 +27,7 @@ MAN8=lvchange.8 lvcreate.8 lvdisplay.8 lvextend.8 lvm.8 lvmchange.8 \
MAN5DIR=${mandir}/man5
MAN8DIR=${mandir}/man8
-include ../make.tmpl
+include $(top_srcdir)/make.tmpl
install:
@echo "Installing $(MAN8) in $(MAN8DIR)"
diff --git a/old-tests/device/Makefile.in b/old-tests/device/Makefile.in
index 9263efab..85b73bf7 100644
--- a/old-tests/device/Makefile.in
+++ b/old-tests/device/Makefile.in
@@ -21,7 +21,7 @@ SOURCES=\
TARGETS=dev_cache_t
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
dev_cache_t: dev_cache_t.o $(top_srcdir)/lib/liblvm.a
$(CC) -o dev_cache_t dev_cache_t.o -L$(top_srcdir)/lib -llvm
diff --git a/old-tests/filters/Makefile.in b/old-tests/filters/Makefile.in
index ccd67bbc..7beb73a6 100644
--- a/old-tests/filters/Makefile.in
+++ b/old-tests/filters/Makefile.in
@@ -24,7 +24,7 @@ TARGETS=\
rfilter_t \
pfilter_t
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
rfilter_t: rfilter_t.o $(top_srcdir)/lib/liblvm.a
$(CC) -o rfilter_t rfilter_t.o -L$(top_srcdir)/lib -llvm
diff --git a/old-tests/format1/Makefile.in b/old-tests/format1/Makefile.in
index f2c9bcd8..5661555b 100644
--- a/old-tests/format1/Makefile.in
+++ b/old-tests/format1/Makefile.in
@@ -31,7 +31,7 @@ TARGETS=\
read_pv_t \
get_vgs_t
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
read_vg_t: read_vg_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a
$(CC) -o read_vg_t read_vg_t.o pretty_print.o -L$(top_srcdir)/lib -llvm
diff --git a/old-tests/mm/Makefile.in b/old-tests/mm/Makefile.in
index b3957109..6dbdad7f 100644
--- a/old-tests/mm/Makefile.in
+++ b/old-tests/mm/Makefile.in
@@ -21,7 +21,7 @@ SOURCES=\
TARGETS=dbg_malloc_t
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
dbg_malloc_t: dbg_malloc_t.o
$(CC) $(CFLAGS) -o dbg_malloc_t dbg_malloc_t.o \
diff --git a/old-tests/regex/Makefile.in b/old-tests/regex/Makefile.in
index 83bd739c..859ad0ea 100644
--- a/old-tests/regex/Makefile.in
+++ b/old-tests/regex/Makefile.in
@@ -24,7 +24,7 @@ TARGETS=\
parse_t \
matcher_t
-include ../../make.tmpl
+include $(top_srcdir)/make.tmpl
parse_t: parse_t.o $(top_srcdir)/lib/liblvm.a
$(CC) -o parse_t parse_t.o -L$(top_srcdir)/lib -llvm
diff --git a/po/Makefile.in b/po/Makefile.in
index 603854ae..cfa22d0e 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -19,7 +19,7 @@ LANGS=de
TARGETS=$(LANGS:%=%.mo)
-include ../make.tmpl
+include $(top_srcdir)/make.tmpl
install: $(TARGETS)
@echo Installing translation files in $(localedir)