From a6fa759af695d54430a2d15aea493e65d48a0073 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 21 Sep 2018 17:47:59 +0900 Subject: Fixed FTBFS due to qt_include variable. Signed-off-by: Michele Calgaro --- dcopperl/Makefile.PL.in | 2 +- smoke/tde/generate.pl.in | 2 +- smoke/tde/qtguess.pl.in | 2 +- smoke/tqt/generate.pl.in | 2 +- smoke/tqt/qtguess.pl.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dcopperl/Makefile.PL.in b/dcopperl/Makefile.PL.in index c3ebc1e3..04ae81e6 100644 --- a/dcopperl/Makefile.PL.in +++ b/dcopperl/Makefile.PL.in @@ -6,7 +6,7 @@ use Config; print "Trying to find some configuration information...\n"; my $tde_inc = "@kde_includes@"; my $tde_lib = "@kde_libraries@"; -my $qt_inc = "@qt_includes@"; +my $qt_inc = "@tqt_includes@"; my $qt_lib = "@qt_libraries@"; WriteMakefile( diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in index e3c21747..894ef635 100644 --- a/smoke/tde/generate.pl.in +++ b/smoke/tde/generate.pl.in @@ -145,7 +145,7 @@ if("@KDE_HAVE_GL@" eq "yes") # List Qt headers, and exclude the ones listed above my @headers = (); -$qtinc= '@qt_includes@'; +$qtinc= '@tqt_includes@'; opendir (QT, $qtinc) or die "Couldn't find $qtinc"; foreach $filename (readdir(QT)) { $entry = $qtinc."/".$filename; diff --git a/smoke/tde/qtguess.pl.in b/smoke/tde/qtguess.pl.in index da7b6ad8..5955fbd6 100644 --- a/smoke/tde/qtguess.pl.in +++ b/smoke/tde/qtguess.pl.in @@ -35,7 +35,7 @@ my %qtdefs=(); my %qtundefs=(); my $tmp = gettmpfile(); -my $qtinc = '@qt_includes@'; +my $qtinc = '@tqt_includes@'; my $allinc = '@all_includes@'; my $alllib = '@all_libraries@'; my $qtflags ='@LIB_TQT@'; diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in index 8c156a37..3b8ba05b 100644 --- a/smoke/tqt/generate.pl.in +++ b/smoke/tqt/generate.pl.in @@ -115,7 +115,7 @@ if("@KDE_HAVE_GL@" eq "yes") # List Qt headers, and exclude the ones listed above my @headers = (); -$qtinc= '@qt_includes@'; +$qtinc= '@tqt_includes@'; opendir (QT, $qtinc) or die "Couldn't find $qtinc"; foreach $filename (readdir(QT)) { $entry = $qtinc."/".$filename; diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in index da7b6ad8..5955fbd6 100644 --- a/smoke/tqt/qtguess.pl.in +++ b/smoke/tqt/qtguess.pl.in @@ -35,7 +35,7 @@ my %qtdefs=(); my %qtundefs=(); my $tmp = gettmpfile(); -my $qtinc = '@qt_includes@'; +my $qtinc = '@tqt_includes@'; my $allinc = '@all_includes@'; my $alllib = '@all_libraries@'; my $qtflags ='@LIB_TQT@'; -- cgit v1.2.3