From 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:52:17 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- acinclude.m4.in | 4 ++-- am_edit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acinclude.m4.in b/acinclude.m4.in index 001c447..f46a898 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -2319,7 +2319,7 @@ if test $kde_qtver = 4; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") + AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") @@ -2345,7 +2345,7 @@ elif test $kde_qtver = 3; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") + AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") diff --git a/am_edit b/am_edit index 46ad438..97e7aec 100644 --- a/am_edit +++ b/am_edit @@ -1363,7 +1363,7 @@ sub tag_UIFILES () $dep_lines .= "\trm -f $source.$cxxsuffix\n"; if (!$kdeopts{"qtonly"}) { $dep_lines .= "\techo '#include ' > $source.$cxxsuffix\n"; - $dep_lines .= "\techo '#include ' >> $source.$cxxsuffix\n"; + $dep_lines .= "\techo '#include ' >> $source.$cxxsuffix\n"; my ($mangled_source) = $source; $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n"; -- cgit v1.2.3