[gimp-perl] make Makefile.PL survive non-conf deps so can say what deps are
- From: Ed J <edj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-perl] make Makefile.PL survive non-conf deps so can say what deps are
- Date: Thu, 11 Apr 2019 19:38:54 +0000 (UTC)
commit f9f5677f55cee76a71143daa061b7055a50508b7
Author: Ed J <mohawk2 users noreply github com>
Date: Thu Apr 11 20:24:24 2019 +0100
make Makefile.PL survive non-conf deps so can say what deps are
Changes | 3 +++
Makefile.PL | 19 +++++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/Changes b/Changes
index 1c53bc1..13912a8 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
Revision history for Perl module Gimp
+2.33
+ - Makefile.PL survive non-conf deps so can say what deps are
+
2.32 2016-05-08
[API]
diff --git a/Makefile.PL b/Makefile.PL
index f3bd136..fadfb0e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,15 +23,18 @@ setver:
EOF
}
-my @ext_deps = qw(Alien::Gimp Gtk2 PDL);
-my $pkg = ExtUtils::Depends->new('Gimp', @ext_deps);
my $IDIR = 'lib/Gimp/Install';
my $IFILES = "$IDIR/Files.pm";
-mkdir $IDIR unless -d $IDIR;
-$pkg->save_config($IFILES);
-# reinit so no PM which breaks XSMULTI
-$pkg = ExtUtils::Depends->new('Gimp', @ext_deps);
-$pkg->set_inc(q{-Ddatadir='""'});
+my $pkg = eval {
+ my @ext_deps = qw(Alien::Gimp Gtk2 PDL);
+ my $pkg = ExtUtils::Depends->new('Gimp', @ext_deps);
+ mkdir $IDIR unless -d $IDIR;
+ $pkg->save_config($IFILES);
+ # reinit so no PM which breaks XSMULTI
+ $pkg = ExtUtils::Depends->new('Gimp', @ext_deps);
+ $pkg->set_inc(q{-Ddatadir='""'});
+ $pkg;
+};
my $runtime_reqs = {
'Gtk2' => 1.0,
@@ -77,5 +80,5 @@ WriteMakefile(
DIR => [ qw/examples/ ], # exclude po
EXE_FILES => [ map { "utils/$_" } qw(gimpdoc xcftopnm embedxpm scm2perl) ],
clean => { FILES => $IFILES },
- $pkg->get_makefile_vars,
+ ($pkg ? $pkg->get_makefile_vars : ()),
);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]