Browse Source

Rename KDEHOME and KDEDIR

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
4e09791515
4 changed files with 26 additions and 26 deletions
  1. 1
    1
      INSTALL
  2. 11
    11
      acinclude.m4
  3. 11
    11
      aclocal.m4
  4. 3
    3
      doc/help_en.docbook

+ 1
- 1
INSTALL View File

@@ -6,7 +6,7 @@ Dependencies:
6 6
 - Autoconf 2.5
7 7
 - Automake 1.6
8 8
 
9
-You'll also need to have your $KDEDIR environment variable set correctly.
9
+You'll also need to have your $TDEDIR environment variable set correctly.
10 10
 
11 11
 
12 12
 Installing from Tarball Distribution:

+ 11
- 11
acinclude.m4 View File

@@ -377,13 +377,13 @@ same compiler to compile Qt and tdelibs as you did use now.
377 377
 For more details about this problem, look at the end of config.log.])
378 378
 fi
379 379
 
380
-if eval `KDEDIR= ./conftest 2>&5`; then
380
+if eval `TDEDIR= ./conftest 2>&5`; then
381 381
   kde_result=done
382 382
 else
383 383
   kde_result=problems
384 384
 fi
385 385
 
386
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
386
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
387 387
 kde_have_all_paths=yes
388 388
 
389 389
 KDE_SET_PATHS($kde_result)
@@ -524,11 +524,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
524 524
 [
525 525
 
526 526
         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"
527
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
528
-        if test -n "$KDEDIRS"; then
527
+        test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
528
+        if test -n "$TDEDIRS"; then
529 529
            kde_save_IFS=$IFS
530 530
            IFS=:
531
-           for dir in $KDEDIRS; do
531
+           for dir in $TDEDIRS; do
532 532
                 kde_default_bindirs="$dir/bin $kde_default_bindirs "
533 533
            done
534 534
            IFS=$kde_save_IFS
@@ -543,7 +543,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
543 543
       
544 544
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
545 545
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
546
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
546
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
547 547
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
548 548
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
549 549
 		KDE_XSL_STYLESHEET=""
@@ -1663,7 +1663,7 @@ fi
1663 1663
 if test -z "$1"; then
1664 1664
 
1665 1665
 kde_incdirs="/opt/trinity/include/kde /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"
1666
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1666
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs"
1667 1667
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1668 1668
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1669 1669
 ac_kde_includes="$kde_incdir"
@@ -1675,7 +1675,7 @@ So, check this please and use another prefix!])
1675 1675
 fi
1676 1676
 
1677 1677
 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}"
1678
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
1678
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1679 1679
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1680 1680
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1681 1681
 ac_kde_libraries="$kde_libdir"
@@ -2997,7 +2997,7 @@ AC_CANONICAL_SYSTEM
2997 2997
 AC_ARG_PROGRAM
2998 2998
 AM_INIT_AUTOMAKE($1, $2)
2999 2999
 AM_DISABLE_LIBRARIES
3000
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3000
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3001 3001
 AC_CHECK_COMPILERS
3002 3002
 KDE_PROG_LIBTOOL
3003 3003
 AM_KDE_WITH_NLS
@@ -4581,8 +4581,8 @@ AC_DEFUN(KDE_CONF_FILES,
4581 4581
 AC_DEFUN(KDE_SET_PREFIX,
4582 4582
 [
4583 4583
   unset CDPATH
4584
-  dnl make $KDEDIR the default for the installation
4585
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4584
+  dnl make $TDEDIR the default for the installation
4585
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4586 4586
 
4587 4587
   if test "x$prefix" = "xNONE"; then
4588 4588
     prefix=$ac_default_prefix

+ 11
- 11
aclocal.m4 View File

@@ -389,13 +389,13 @@ same compiler to compile Qt and tdelibs as you did use now.
389 389
 For more details about this problem, look at the end of config.log.])
390 390
 fi
391 391
 
392
-if eval `KDEDIR= ./conftest 2>&5`; then
392
+if eval `TDEDIR= ./conftest 2>&5`; then
393 393
   kde_result=done
394 394
 else
395 395
   kde_result=problems
396 396
 fi
397 397
 
398
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
398
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
399 399
 kde_have_all_paths=yes
400 400
 
401 401
 KDE_SET_PATHS($kde_result)
@@ -536,11 +536,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
536 536
 [
537 537
 
538 538
         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"
539
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
540
-        if test -n "$KDEDIRS"; then
539
+        test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
540
+        if test -n "$TDEDIRS"; then
541 541
            kde_save_IFS=$IFS
542 542
            IFS=:
543
-           for dir in $KDEDIRS; do
543
+           for dir in $TDEDIRS; do
544 544
                 kde_default_bindirs="$dir/bin $kde_default_bindirs "
545 545
            done
546 546
            IFS=$kde_save_IFS
@@ -555,7 +555,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
555 555
       
556 556
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
557 557
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
558
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
558
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
559 559
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
560 560
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
561 561
 		KDE_XSL_STYLESHEET=""
@@ -1675,7 +1675,7 @@ fi
1675 1675
 if test -z "$1"; then
1676 1676
 
1677 1677
 kde_incdirs="/opt/trinity/include/kde /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"
1678
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1678
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs"
1679 1679
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1680 1680
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1681 1681
 ac_kde_includes="$kde_incdir"
@@ -1687,7 +1687,7 @@ So, check this please and use another prefix!])
1687 1687
 fi
1688 1688
 
1689 1689
 kde_libdirs="/opt/trinity/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}"
1690
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
1690
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1691 1691
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1692 1692
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1693 1693
 ac_kde_libraries="$kde_libdir"
@@ -3009,7 +3009,7 @@ AC_CANONICAL_SYSTEM
3009 3009
 AC_ARG_PROGRAM
3010 3010
 AM_INIT_AUTOMAKE($1, $2)
3011 3011
 AM_DISABLE_LIBRARIES
3012
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3012
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3013 3013
 AC_CHECK_COMPILERS
3014 3014
 KDE_PROG_LIBTOOL
3015 3015
 AM_KDE_WITH_NLS
@@ -4593,8 +4593,8 @@ AC_DEFUN(KDE_CONF_FILES,
4593 4593
 AC_DEFUN(KDE_SET_PREFIX,
4594 4594
 [
4595 4595
   unset CDPATH
4596
-  dnl make $KDEDIR the default for the installation
4597
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4596
+  dnl make $TDEDIR the default for the installation
4597
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4598 4598
 
4599 4599
   if test "x$prefix" = "xNONE"; then
4600 4600
     prefix=$ac_default_prefix

+ 3
- 3
doc/help_en.docbook View File

@@ -610,10 +610,10 @@
610 610
 				Knights uses <application>autoconf</application> and <application>automake</application> to ensure that compiling is easy. If for some reason Knights won't compile for you, help is available at the Knights Project website located at <ulink url="http://knights.sourceforge.net/">http://knights.sourceforge.net</ulink>.
611 611
 			</para>
612 612
 			<para>
613
-				You must have the KDEDIR environment variable defined before you begin the installation. Without this, Knights will not be able to access it's resources! To add the KDEDIR environment variable, you need to edit your /etc/profile ( or ~/.bash_profile ) and add the line:
613
+				You must have the TDEDIR environment variable defined before you begin the installation. Without this, Knights will not be able to access it's resources! To add the TDEDIR environment variable, you need to edit your /etc/profile ( or ~/.bash_profile ) and add the line:
614 614
 			</para>
615 615
 			<para>
616
-				<userinput><command>export KDEDIR="/usr"</command></userinput>
616
+				<userinput><command>export TDEDIR="/usr"</command></userinput>
617 617
 			</para>
618 618
 			<para>
619 619
 				...where /usr is your KDE's base directory.
@@ -643,7 +643,7 @@
643 643
 <prompt>%</prompt> <userinput><command>knights</command> <option>-d <replaceable>path</replaceable></option></userinput>
644 644
 </screen>
645 645
 		<para>
646
-			The use of this command line option is depreciated. If Knights displays garbage rather than a chessboard, then you did not set the KDEDIR environment variable correctly before compiling Knights. Please see the Installation instructions for the proper compiling procedures.
646
+			The use of this command line option is depreciated. If Knights displays garbage rather than a chessboard, then you did not set the TDEDIR environment variable correctly before compiling Knights. Please see the Installation instructions for the proper compiling procedures.
647 647
 		</para>
648 648
 <screen width="40">
649 649
 <prompt>%</prompt> <userinput><command>knights</command> <option><replaceable>filename</replaceable></option></userinput>

Loading…
Cancel
Save