From 9e3420922de3388ea56a0b3c359f116071563e78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Jan 2013 23:18:55 -0600 Subject: [PATCH] Rename a few build variables for overall consistency --- acinclude.m4 | 6 +++--- bibletime/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6f3977a..9bb3e5f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2082,14 +2082,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDNSSD, "-ltdednssd") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2099,7 +2099,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/bibletime/Makefile.am b/bibletime/Makefile.am index a176c7e..ee9c3dd 100644 --- a/bibletime/Makefile.am +++ b/bibletime/Makefile.am @@ -16,7 +16,7 @@ $(LIB_QT) \ $(LIB_TDECORE) \ $(LIB_TDEUI) \ -ltdeprint \ -$(LIB_KFILE) \ +$(LIB_TDEFILE) \ $(LIB_TDEHTML) \ $(LIB_X11) \ $(LIB_SWORD) \