diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-01-28 00:48:26 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-01-28 00:48:26 -0500 |
| commit | 75e1bc3ca1b20ad4512775e4b63b835d23cb2560 (patch) | |
| tree | d1dfc3b253bf9a0cc5bc380a7a2f65f914622fc4 /Debian | |
| parent | 48b71fb021ac6e60c7baf52026ee77c3872553cc (diff) | |
| download | debhelper-75e1bc3ca1b20ad4512775e4b63b835d23cb2560.tar.gz | |
update from Kel
Here is yet another revision which sets the PREFIX variable to '/usr' which
seems commonly used by Qt projects. Also removed the -e test discussed
previously.
Diffstat (limited to 'Debian')
| -rw-r--r-- | Debian/Debhelper/Buildsystem/qmake.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm index 823a70e3..4e67f918 100644 --- a/Debian/Debhelper/Buildsystem/qmake.pm +++ b/Debian/Debhelper/Buildsystem/qmake.pm @@ -20,7 +20,7 @@ sub check_auto_buildable { my @projects=glob($this->get_sourcepath('*.pro')); my $ret=0; - if (@projects > 0 && -e $projects[0]) { + if (@projects > 0) { $ret=1; # Existence of a Makefile generated by qmake indicates qmake # class has already been used by a prior build step, so should @@ -64,6 +64,7 @@ sub configure { push @flags, "QMAKE_LFLAGS_DEBUG=$ENV{LDFLAGS}"; } push @flags, "QMAKE_STRIP=:"; + push @flags, "PREFIX=/usr"; $this->doit_in_builddir('qmake', @options, @flags, @_); } @@ -77,4 +78,4 @@ sub install { $this->SUPER::install($destdir, "INSTALL_ROOT=$destdir", @_); } -1; +1 |