diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2009-06-24 11:55:57 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2009-06-24 11:55:57 +0100 |
| commit | b91d47063c729246c65c41f827bcb1dc927529c0 (patch) | |
| tree | 3a1758cff1466699540a01fe4759b8f86c6895b6 | |
| parent | e1c62f6332ae07cb6f95130dcc9852701d085e2b (diff) | |
| parent | 5e332cc6c06532191f793a6789bafe818f726258 (diff) | |
| download | libguestfs-b91d47063c729246c65c41f827bcb1dc927529c0.tar.gz libguestfs-b91d47063c729246c65c41f827bcb1dc927529c0.tar.xz libguestfs-b91d47063c729246c65c41f827bcb1dc927529c0.zip | |
Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
| -rw-r--r-- | perl/Makefile.PL.in | 3 | ||||
| -rw-r--r-- | perl/Makefile.am | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in index 423b4a18..40d1d6c4 100644 --- a/perl/Makefile.PL.in +++ b/perl/Makefile.PL.in @@ -24,5 +24,6 @@ WriteMakefile ( VERSION => '@PACKAGE_VERSION@', LIBS => '-L@abs_top_builddir@/src/.libs -lguestfs', - INC => '-Wall @CFLAGS@ -I@abs_top_builddir@/src', + INC => '-I@abs_top_builddir@/src', + CCFLAGS => '@CFLAGS@', ); diff --git a/perl/Makefile.am b/perl/Makefile.am index 44ac42c0..747ac436 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -41,10 +41,12 @@ TESTS_ENVIRONMENT = \ INSTALLDIRS = site -all: - perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) +all: Makefile-pl $(MAKE) -f Makefile-pl +Makefile-pl: Makefile.PL + perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) + install-data-hook: $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install |