Browse Source

Convert remaining references to kde3 (e.g. in paths) to trinity


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/bibletime@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 7 years ago
parent
commit
1164a93612
4 changed files with 25 additions and 25 deletions
  1. 20
    20
      acinclude.m4
  2. 1
    1
      bibletime.m4
  3. 2
    2
      bibletime.spec
  4. 2
    2
      bibletime.spec.in

+ 20
- 20
acinclude.m4 View File

@@ -479,14 +479,14 @@ if test "$1" = "default"; then
479 479
     if test "$kde_qtver" = "2"; then
480 480
       kde_moduledir='\${libdir}/kde2'
481 481
     else
482
-      kde_moduledir='\${libdir}/kde3'
482
+      kde_moduledir='\${libdir}/trinity'
483 483
     fi
484 484
   fi
485 485
   if test -z "$kde_styledir"; then
486
-    kde_styledir='\${libdir}/kde3/plugins/styles'
486
+    kde_styledir='\${libdir}/trinity/plugins/styles'
487 487
   fi
488 488
   if test -z "$kde_widgetdir"; then
489
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
489
+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
490 490
   fi
491 491
   if test -z "$xdg_appsdir"; then
492 492
     xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
546 546
 
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549
-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
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 550
     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551 551
     if test -n "$KDEDIRS"; then
552 552
        kde_save_IFS=$IFS
@@ -580,34 +580,34 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
580 580
         fi
581 581
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
582 582
 
583
-        kde32ornewer=1
584
-        kde33ornewer=1
583
+        trinity2ornewer=1
584
+        trinity3ornewer=1
585 585
         if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
586
-            kde32ornewer=
587
-            kde33ornewer=
586
+            trinity2ornewer=
587
+            trinity3ornewer=
588 588
         else
589 589
             if test "$kde_qtver" = "3"; then
590 590
               if test "$kde_qtsubver" -le 1; then
591
-                kde32ornewer=
591
+                trinity2ornewer=
592 592
               fi
593 593
               if test "$kde_qtsubver" -le 2; then
594
-                kde33ornewer=
594
+                trinity3ornewer=
595 595
               fi
596 596
             fi
597 597
         fi
598 598
 
599
-        if test -n "$kde32ornewer"; then
599
+        if test -n "$trinity2ornewer"; then
600 600
             KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
601 601
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
602 602
         fi
603
-        if test -n "$kde33ornewer"; then
603
+        if test -n "$trinity3ornewer"; then
604 604
             KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
605 605
             AC_SUBST(MAKEKDEWIDGETS)
606 606
         fi
607 607
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
608 608
 
609 609
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
610
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
610
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
611 611
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
612 612
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
613 613
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -618,7 +618,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
618 618
         fi
619 619
 
620 620
         DCOP_DEPENDENCIES='$(DCOPIDL)'
621
-        if test -n "$kde32ornewer"; then
621
+        if test -n "$trinity2ornewer"; then
622 622
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
623 623
             DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
624 624
             AC_SUBST(KCONFIG_COMPILER)
@@ -1794,7 +1794,7 @@ fi
1794 1794
 
1795 1795
 if test -z "$1"; then
1796 1796
 
1797
-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/kde3/include /opt/kde/include $x_includes $qt_includes"
1797
+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"
1798 1798
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1799 1799
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1800 1800
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1806,7 +1806,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1806 1806
 So, check this please and use another prefix!])
1807 1807
 fi
1808 1808
 
1809
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1809
+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1810 1810
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1811 1811
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1812 1812
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1814,7 +1814,7 @@ ac_kde_libraries="$kde_libdir"
1814 1814
 
1815 1815
 kde_widgetdir=NO
1816 1816
 dnl this might be somewhere else
1817
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1817
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1818 1818
 
1819 1819
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
1820 1820
 AC_MSG_ERROR([
@@ -1822,14 +1822,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
1822 1822
 So, check this please and use another prefix!])
1823 1823
 fi
1824 1824
 
1825
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1825
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
1826 1826
 AC_MSG_ERROR([
1827 1827
 I can't find the designer plugins. These are required and should have been installed
1828 1828
 by kdelibs])
1829 1829
 fi
1830 1830
 
1831 1831
 if test -n "$kde_widgetdir"; then
1832
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
1832
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
1833 1833
 fi
1834 1834
 
1835 1835
 
@@ -11931,7 +11931,7 @@ fi
11931 11931
 if test "$ac_rpm_prefix" = "auto"; then
11932 11932
 AC_CACHE_VAL(RPM_PREFIX, [
11933 11933
 if test "$DISTRIBUTION" = "SuSE"; then
11934
-	RPM_PREFIX="/opt/kde3"
11934
+	RPM_PREFIX="/opt/trinity"
11935 11935
 elif test "$DISTRIBUTION" = "Mandrake"; then
11936 11936
 	RPM_PREFIX="/usr"	
11937 11937
 elif test "$DISTRIBUTION" = "Red Hat"; then

+ 1
- 1
bibletime.m4 View File

@@ -103,7 +103,7 @@ fi
103 103
 if test "$ac_rpm_prefix" = "auto"; then
104 104
 AC_CACHE_VAL(RPM_PREFIX, [
105 105
 if test "$DISTRIBUTION" = "SuSE"; then
106
-	RPM_PREFIX="/opt/kde3"
106
+	RPM_PREFIX="/opt/trinity"
107 107
 elif test "$DISTRIBUTION" = "Mandrake"; then
108 108
 	RPM_PREFIX="/usr"	
109 109
 elif test "$DISTRIBUTION" = "Red Hat"; then

+ 2
- 2
bibletime.spec View File

@@ -60,8 +60,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
60 60
 make -f Makefile.cvs
61 61
 
62 62
 # Look for common rpm-options:
63
-if [ -f /etc/opt/kde3/common_options ]; then
64
-  . /etc/opt/kde3/common_options
63
+if [ -f /etc/opt/trinity/common_options ]; then
64
+  . /etc/opt/trinity/common_options
65 65
   ./configure $configkde
66 66
 else
67 67
   ./configure --prefix=${_prefix}

+ 2
- 2
bibletime.spec.in View File

@@ -60,8 +60,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
60 60
 make -f Makefile.cvs
61 61
 
62 62
 # Look for common rpm-options:
63
-if [ -f /etc/opt/kde3/common_options ]; then
64
-  . /etc/opt/kde3/common_options
63
+if [ -f /etc/opt/trinity/common_options ]; then
64
+  . /etc/opt/trinity/common_options
65 65
   ./configure $configkde
66 66
 else
67 67
   ./configure --prefix=${_prefix}

Loading…
Cancel
Save