← Back to branch summary

~ubuntu-branches/ubuntu/lucid/debhelper/lucid

« back to all changes in this revision

Viewing changes to Debian/Debhelper/Buildsystem/autoconf.pm

  • Committer: Bazaar Package Importer
  • Author(s): أحمد المحمودي (Ahmed El-Mahmoudy), أحمد المحمودي (Ahmed El-Mahmoudy), Daniel Holbach
  • Date: 2009-12-16 09:01:54 UTC
  • mfrom: (1.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20091216090154-4qtf6jm09jtbsnfg
Tags: 7.4.10ubuntu1
https://launchpad.net/bugs/485956
[ أحمد المحمودي (Ahmed El-Mahmoudy) ]
* Merge with Debian unstable (LP: #485956). Remaining Ubuntu changes:
  - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
  - Add various autoscripts for above: postinst-upstart,
    postinst-upstart-replace, postinst-upstart-restart,
    prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
  - dh_installudev: Handle conffile migration from old Ubuntu defaults
    (needed until after the next LTS release).

[ Daniel Holbach ]
* Port merge from 7.4.7 to 7.4.10.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Debian/Debhelper/Buildsystem/autoconf.pm
18
18
        my $this=shift;
19
19
        my ($step)=@_;
20
20
 
21
 
        # Handle configure; the rest - next class
 
21
        # Handle configure; the rest - next class (compat with 7.0.x code path)
22
22
        if ($step eq "configure") {
23
 
                return -x $this->get_sourcepath("configure");
 
23
                return 1 if -x $this->get_sourcepath("configure");
24
24
        }
25
25
        return 0;
26
26
}
49
49
        }
50
50
 
51
51
        $this->mkdir_builddir();
52
 
        $this->doit_in_builddir($this->get_source_rel2builddir("configure"), @opts, @_);
 
52
        eval {
 
53
                $this->doit_in_builddir($this->get_source_rel2builddir("configure"), @opts, @_);
 
54
        };
 
55
        if ($@) {
 
56
                if (-e $this->get_buildpath("config.log")) {
 
57
                        $this->doit_in_builddir("tail -v -n +0 config.log");
 
58
                }
 
59
                die $@;
 
60
        }
53
61
}
54
62
 
55
63
1