Don't run "make install" when qt-copy is configured with prefix==$PWD (i.e. the qt3 way).

Running make install overwrites all forwarding headers with the actual headers, and this breaks
compilation when updating qt-copy the next time after that.

Please check the way I get the qt source dir and prefix.
CCMAIL: michael.pyne@kdemail.net

svn path=/trunk/KDE/kdesdk/scripts/kdesvn-build; revision=581147
wilder
David Faure 20 years ago
parent 4b32b7d4eb
commit 31952b6079
  1. 13
      kdesvn-build

@ -4881,6 +4881,15 @@ EOF
}
}
# Does qt-copy (for qt4) need "make install"? Yes, unless configured with prefix=srcdir.
sub qt_copy_qt4_needs_make_install
{
my $qtsource = get_fullpath('qt-copy', 'source');
my $prefix = get_option('qt-copy', 'qtdir');
return 0 if $qtsource eq $prefix;
return 1;
}
# Subroutine to handle the installation process. Simply calls
# 'make install' in the directory.
sub handle_install
@ -4895,7 +4904,9 @@ sub handle_install
check_for_module_config ($module);
if (list_has(@no_install_modules, $module) or
($module eq 'qt-copy' and is_qt_copy_qt3()))
($module eq 'qt-copy' and is_qt_copy_qt3()) or
($module eq 'qt-copy' and !qt_copy_qt4_needs_make_install())
)
{
info "\tg[$module] doesn't need to be installed.";
next;

Loading…
Cancel
Save