summaryrefslogtreecommitdiffstats
path: root/perl
diff options
context:
space:
mode:
authorMatthew Booth <mbooth@redhat.com>2009-07-03 11:52:50 +0100
committerMatthew Booth <mbooth@redhat.com>2009-07-03 16:16:51 +0100
commit349814e9d912c4f372b8fbdfb10b03749911021f (patch)
tree7168b6ee4dadd363a28a73e2a5ff26799395d75c /perl
parent5f9cb51f11879ece8b921d833850505d7e57d339 (diff)
downloadlibguestfs-349814e9d912c4f372b8fbdfb10b03749911021f.tar.gz
libguestfs-349814e9d912c4f372b8fbdfb10b03749911021f.tar.xz
libguestfs-349814e9d912c4f372b8fbdfb10b03749911021f.zip
Make it possible to build in a separate directory
This patch allows you to do: mkdir build cd build ../configure ... make This will output all generated files to the build directory. Given that autogen automatically runs configure, you can also do: BUILDDIR=./build ./autogen.sh which will do the right thing. Also: * Fix a dependency bug which means that guestfs_protocol.h isn't automatically rebuilt. * Re-running autogen.sh with no arguments won't blow away your previous configure arguments.
Diffstat (limited to 'perl')
-rw-r--r--perl/Makefile.PL.in5
-rw-r--r--perl/Makefile.am4
2 files changed, 5 insertions, 4 deletions
diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in
index 40d1d6c4..d18aba63 100644
--- a/perl/Makefile.PL.in
+++ b/perl/Makefile.PL.in
@@ -23,7 +23,8 @@ WriteMakefile (
NAME => 'Sys::Guestfs',
VERSION => '@PACKAGE_VERSION@',
- LIBS => '-L@abs_top_builddir@/src/.libs -lguestfs',
- INC => '-I@abs_top_builddir@/src',
+ LIBS => '-L@top_builddir@/src/.libs -lguestfs',
+ INC => '-I@top_builddir@/src -I@top_srcdir@/src',
+ TYPEMAPS => [ '@srcdir@/typemap' ],
CCFLAGS => '@CFLAGS@',
);
diff --git a/perl/Makefile.am b/perl/Makefile.am
index 747ac436..66d1d4b1 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -36,8 +36,8 @@ if HAVE_PERL
TESTS = run-bindtests run-perl-tests
TESTS_ENVIRONMENT = \
- LD_LIBRARY_PATH=../src/.libs \
- LIBGUESTFS_PATH=../appliance
+ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+ LIBGUESTFS_PATH=$(top_builddir)/appliance
INSTALLDIRS = site