Allow for a build directory separate from the source.

3 files changed, 65 insertions, 64 deletions

diff --git a/include/.symlinks b/include/.symlinks
deleted file mode 100644
index 4a637d8bd..000000000
--- a/include/.symlinks
+++ /dev/null
@@ -1,61 +0,0 @@
-../daemons/clvmd/clvm.h
-../daemons/dmeventd/libdevmapper-event.h
-../liblvm/lvm2app.h
-../lib/activate/activate.h
-../lib/activate/targets.h
-../lib/cache/lvmcache.h
-../lib/commands/errors.h
-../lib/commands/toolcontext.h
-../lib/config/config.h
-../lib/config/defaults.h
-../lib/datastruct/btree.h
-../lib/datastruct/lvm-types.h
-../lib/datastruct/str_list.h
-../lib/device/dev-cache.h
-../lib/device/device.h
-../lib/display/display.h
-../lib/filters/filter-composite.h
-../lib/filters/filter-md.h
-../lib/filters/filter-persistent.h
-../lib/filters/filter-regex.h
-../lib/filters/filter-sysfs.h
-../lib/filters/filter.h
-../lib/format1/format1.h
-../lib/format_pool/format_pool.h
-../lib/format_text/archiver.h
-../lib/format_text/format-text.h
-../lib/format_text/text_export.h
-../lib/format_text/text_import.h
-../lib/label/label.h
-../lib/locking/locking.h
-../lib/log/log.h
-../lib/log/lvm-logging.h
-../lib/metadata/lv_alloc.h
-../lib/metadata/metadata.h
-../lib/metadata/metadata-exported.h
-../lib/metadata/pv_alloc.h
-../lib/metadata/segtype.h
-../lib/mm/memlock.h
-../lib/mm/xlate.h
-../lib/misc/configure.h
-../lib/misc/crc.h
-../lib/misc/intl.h
-../lib/misc/util.h
-../lib/misc/last-path-component.h
-../lib/misc/lib.h
-../lib/misc/lvm-exec.h
-../lib/misc/lvm-file.h
-../lib/misc/lvm-globals.h
-../lib/misc/lvm-string.h
-../lib/misc/lvm-version.h
-../lib/misc/lvm-wrappers.h
-../lib/misc/sharedlib.h
-../lib/report/report.h
-../lib/uuid/uuid.h
-../libdm/libdevmapper.h
-../libdm/misc/dm-ioctl.h
-../libdm/misc/dm-logging.h
-../libdm/misc/dm-log-userspace.h
-../libdm/misc/dmlib.h
-../libdm/misc/kdev_t.h
-../po/pogen.h
diff --git a/include/.symlinks.in b/include/.symlinks.in
new file mode 100644
index 000000000..39b7a776f
--- /dev/null
+++ b/include/.symlinks.in
@@ -0,0 +1,61 @@
+@top_srcdir@/daemons/clvmd/clvm.h
+@top_srcdir@/daemons/dmeventd/libdevmapper-event.h
+@top_srcdir@/liblvm/lvm2app.h
+@top_srcdir@/lib/activate/activate.h
+@top_srcdir@/lib/activate/targets.h
+@top_srcdir@/lib/cache/lvmcache.h
+@top_srcdir@/lib/commands/errors.h
+@top_srcdir@/lib/commands/toolcontext.h
+@top_srcdir@/lib/config/config.h
+@top_srcdir@/lib/config/defaults.h
+@top_srcdir@/lib/datastruct/btree.h
+@top_srcdir@/lib/datastruct/lvm-types.h
+@top_srcdir@/lib/datastruct/str_list.h
+@top_srcdir@/lib/device/dev-cache.h
+@top_srcdir@/lib/device/device.h
+@top_srcdir@/lib/display/display.h
+@top_srcdir@/lib/filters/filter-composite.h
+@top_srcdir@/lib/filters/filter-md.h
+@top_srcdir@/lib/filters/filter-persistent.h
+@top_srcdir@/lib/filters/filter-regex.h
+@top_srcdir@/lib/filters/filter-sysfs.h
+@top_srcdir@/lib/filters/filter.h
+@top_srcdir@/lib/format1/format1.h
+@top_srcdir@/lib/format_pool/format_pool.h
+@top_srcdir@/lib/format_text/archiver.h
+@top_srcdir@/lib/format_text/format-text.h
+@top_srcdir@/lib/format_text/text_export.h
+@top_srcdir@/lib/format_text/text_import.h
+@top_srcdir@/lib/label/label.h
+@top_srcdir@/lib/locking/locking.h
+@top_srcdir@/lib/log/log.h
+@top_srcdir@/lib/log/lvm-logging.h
+@top_srcdir@/lib/metadata/lv_alloc.h
+@top_srcdir@/lib/metadata/metadata.h
+@top_srcdir@/lib/metadata/metadata-exported.h
+@top_srcdir@/lib/metadata/pv_alloc.h
+@top_srcdir@/lib/metadata/segtype.h
+@top_srcdir@/lib/mm/memlock.h
+@top_srcdir@/lib/mm/xlate.h
+@top_builddir@/lib/misc/configure.h
+@top_srcdir@/lib/misc/crc.h
+@top_srcdir@/lib/misc/intl.h
+@top_srcdir@/lib/misc/util.h
+@top_srcdir@/lib/misc/last-path-component.h
+@top_srcdir@/lib/misc/lib.h
+@top_srcdir@/lib/misc/lvm-exec.h
+@top_srcdir@/lib/misc/lvm-file.h
+@top_srcdir@/lib/misc/lvm-globals.h
+@top_srcdir@/lib/misc/lvm-string.h
+@top_builddir@/lib/misc/lvm-version.h
+@top_srcdir@/lib/misc/lvm-wrappers.h
+@top_srcdir@/lib/misc/sharedlib.h
+@top_srcdir@/lib/report/report.h
+@top_srcdir@/lib/uuid/uuid.h
+@top_srcdir@/libdm/libdevmapper.h
+@top_srcdir@/libdm/misc/dm-ioctl.h
+@top_srcdir@/libdm/misc/dm-logging.h
+@top_srcdir@/libdm/misc/dm-log-userspace.h
+@top_srcdir@/libdm/misc/dmlib.h
+@top_srcdir@/libdm/misc/kdev_t.h
+@top_srcdir@/po/pogen.h
diff --git a/include/Makefile.in b/include/Makefile.in
index 301290ef4..55add369e 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -16,6 +16,7 @@ SHELL = /bin/sh
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 LN_S = @LN_S@
@@ -24,14 +25,14 @@ LN_S = @LN_S@
 
 all: .symlinks_created
 
-.symlinks_created: .symlinks
+.symlinks_created: .symlinks 
 	find . -maxdepth 1 -type l -exec $(RM) \{\} \;
-	for i in `cat .symlinks`; do $(LN_S) $$i ; done
+	for i in `cat $<`; do $(LN_S) $$i ; done
 	touch $@
 
 distclean:
 	find . -maxdepth 1 -type l -exec $(RM) \{\} \;
-	$(RM) Makefile .include_symlinks .symlinks_created
+	$(RM) Makefile .include_symlinks .symlinks_created .symlinks
 
 pofile: all