Browse Source

Rename KDEHOME and KDEDIR

Timothy Pearson 7 years ago
parent
commit
1b2e3a4fae
2 changed files with 14 additions and 14 deletions
  1. 13
    13
      acinclude.m4
  2. 1
    1
      configure.in

+ 13
- 13
acinclude.m4 View File

@@ -382,13 +382,13 @@ same compiler to compile Qt and tdelibs as you did use now.
382 382
 For more details about this problem, look at the end of config.log.])
383 383
 fi
384 384
 
385
-if eval `KDEDIR= ./conftest 2>&5`; then
385
+if eval `TDEDIR= ./conftest 2>&5`; then
386 386
   kde_result=done
387 387
 else
388 388
   kde_result=problems
389 389
 fi
390 390
 
391
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
391
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
392 392
 kde_have_all_paths=yes
393 393
 
394 394
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549 549
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
550
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551
-    if test -n "$KDEDIRS"; then
550
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
551
+    if test -n "$TDEDIRS"; then
552 552
        kde_save_IFS=$IFS
553 553
        IFS=:
554
-       for dir in $KDEDIRS; do
554
+       for dir in $TDEDIRS; do
555 555
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
556 556
        done
557 557
        IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
613 613
 
614 614
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615 615
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
616
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
616
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
617 617
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618 618
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
619 619
 		KDE_XSL_STYLESHEET=""
@@ -1794,7 +1794,7 @@ fi
1794 1794
 if test -z "$1"; then
1795 1795
 
1796 1796
 kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
1797
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1797
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs"
1798 1798
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1799 1799
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1800 1800
 ac_kde_includes="$kde_incdir"
@@ -1806,7 +1806,7 @@ So, check this please and use another prefix!])
1806 1806
 fi
1807 1807
 
1808 1808
 kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
1809
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
1809
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1810 1810
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1811 1811
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1812 1812
 ac_kde_libraries="$kde_libdir"
@@ -3550,7 +3550,7 @@ AC_CANONICAL_SYSTEM
3550 3550
 AC_ARG_PROGRAM
3551 3551
 AM_INIT_AUTOMAKE($1, $2)
3552 3552
 AM_DISABLE_LIBRARIES
3553
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3553
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3554 3554
 AC_CHECK_COMPILERS
3555 3555
 KDE_PROG_LIBTOOL
3556 3556
 AM_KDE_WITH_NLS
@@ -4947,12 +4947,12 @@ AC_DEFUN([KDE_CONF_FILES],
4947 4947
 
4948 4948
 dnl This sets the prefix, for arts and tdelibs
4949 4949
 dnl Do NOT use in any other module.
4950
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
4950
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
4951 4951
 AC_DEFUN([KDE_SET_PREFIX_CORE],
4952 4952
 [
4953 4953
   unset CDPATH
4954
-  dnl make $KDEDIR the default for the installation
4955
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4954
+  dnl make $TDEDIR the default for the installation
4955
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4956 4956
 
4957 4957
   if test "x$prefix" = "xNONE"; then
4958 4958
     prefix=$ac_default_prefix
@@ -4976,7 +4976,7 @@ AC_DEFUN([KDE_SET_PREFIX],
4976 4976
   unset CDPATH
4977 4977
   dnl We can't give real code to that macro, only a value.
4978 4978
   dnl It only matters for --help, since we set the prefix in this function anyway.
4979
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
4979
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
4980 4980
 
4981 4981
   KDE_SET_DEFAULT_BINDIRS
4982 4982
   if test "x$prefix" = "xNONE"; then

+ 1
- 1
configure.in View File

@@ -85,7 +85,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
85 85
       echo "Warning: you chose to install this package in $given_prefix,"
86 86
       echo "but KDE was found in $kde_libs_prefix."
87 87
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
88
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
88
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
89 89
       echo "Then restart KDE."
90 90
       echo ""
91 91
     fi

Loading…
Cancel
Save