diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/acinclude.m4.in | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index abc25a3..78049d4 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -2121,12 +2121,12 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" SS_LIBLINK="-ltdecore -ltdeui -ltdeparts -lDCOP -ltdefx -ltdeio $SS_LIBLINK" AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support]) - AC_DEFINE_UNQUOTED([TDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support]) - AC_DEFINE_UNQUOTED([TDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support]) + AC_DEFINE_UNQUOTED([BASE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support]) + AC_DEFINE_UNQUOTED([BASE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support]) SS_BUILD_FLAGS="k$SS_BUILD_FLAGS" else - AC_DEFINE_UNQUOTED([TDE_DIR], "", [contain path to TDE if compiled with the TDE support]) - AC_DEFINE_UNQUOTED([TDE_LIBDIR], "", [contain path to TDE libs if compiled with the TDE support]) + AC_DEFINE_UNQUOTED([BASE_DIR], "${prefix}", [contain path to TDE if compiled with the TDE support]) + AC_DEFINE_UNQUOTED([BASE_LIBDIR], "${prefix}/lib", [contain path to TDE libs if compiled with the TDE support]) fi if test -n "$SS_OTHER_LIBLINK"; then @@ -2180,7 +2180,12 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], fi done - globalkvircdir="\${datadir}/apps/kvirc" + if test "$SS_KDE_REQUESTED" = "yes"; then + globalkvircdir="\${datadir}/apps/kvirc" + else + globalkvircdir="\${datadir}/kvirc" + fi + AC_SUBST(globalkvircdir) configdir="\${globalkvircdir}/config" @@ -2271,7 +2276,11 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], AC_SUBST(xdg_apps) AC_SUBST(mimelnkdir) - localedir="\${datadir}/locale" + if test "$SS_KDE_REQUESTED" = "yes"; then + localedir="\${datadir}/locale" + else + localedir="\${globalkvircdir}/locale" + fi AC_SUBST(localedir) headersdir="\${exec_prefix}/include/kvirc" |