From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 24 Jun 2009 10:55:57 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
X-Git-Tag: 1.0.52~2
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=b91d47063c729246c65c41f827bcb1dc927529c0;hp=e1c62f6332ae07cb6f95130dcc9852701d085e2b;p=libguestfs.git

Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
---

diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in
index 423b4a1..40d1d6c 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 44ac42c..747ac43 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