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

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-style-lipstik@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 19 insertions, 19 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index d3e2dd3..4a27766 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -459,14 +459,14 @@ if test "$1" = "default"; then
     if test "$kde_qtver" = "2"; then
       kde_moduledir='\${libdir}/kde2'
     else
-      kde_moduledir='\${libdir}/kde3'
+      kde_moduledir='\${libdir}/trinity'
     fi
   fi
   if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
+    kde_styledir='\${libdir}/trinity/plugins/styles'
   fi
   if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
   fi
   if test -z "$xdg_appsdir"; then
     xdg_appsdir='\${datadir}/applications'
@@ -528,7 +528,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
     )
     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
 
-        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"
+        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"
         test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
         if test -n "$KDEDIRS"; then
            kde_save_IFS=$IFS
@@ -553,7 +553,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
 
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -1658,7 +1658,7 @@ fi
 
 if test -z "$1"; then
 
-kde_incdirs="/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"
+kde_incdirs="/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"
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1670,7 +1670,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="/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}"
+kde_libdirs="/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}"
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1678,7 +1678,7 @@ ac_kde_libraries="$kde_libdir"
 
 kde_widgetdir=NO
 dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
 
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
 AC_MSG_ERROR([
@@ -1686,14 +1686,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
 by kdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
 fi
 
 
diff --git a/config.log b/config.log
index 5a1b395..37bc4e9 100644
--- a/config.log
+++ b/config.log
@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
-  $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --prefix=/opt/kde3 --mandir=${prefix}/share/man --infodir=${prefix}/share/info --disable-debug --enable-final --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+  $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --prefix=/opt/trinity --mandir=${prefix}/share/man --infodir=${prefix}/share/info --disable-debug --enable-final --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
 
 ## --------- ##
 ## Platform. ##
@@ -27,9 +27,9 @@ hostinfo               = unknown
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown
 
-PATH: /opt/kde3/bin
-PATH: /opt/kde3/games
-PATH: /opt/kde3/bin
+PATH: /opt/trinity/bin
+PATH: /opt/trinity/games
+PATH: /opt/trinity/bin
 PATH: /home/eldarion/bin
 PATH: /usr/local/sbin
 PATH: /usr/local/bin
@@ -285,7 +285,7 @@ localstatedir='${prefix}/var'
 mandir='${prefix}/share/man'
 mkdir_p=''
 oldincludedir='/usr/include'
-prefix='/opt/kde3'
+prefix='/opt/trinity'
 program_transform_name='s,x,x,'
 qt_includes=''
 qt_libraries=''
diff --git a/lipstik.spec b/lipstik.spec
index e053447..866786f 100644
--- a/lipstik.spec
+++ b/lipstik.spec
@@ -30,10 +30,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644, root, root)
-/usr/lib/kde3/kstyle_lipstik_config.la
-/usr/lib/kde3/kstyle_lipstik_config.so
-/usr/lib/kde3/plugins/styles/lipstik.la
-/usr/lib/kde3/plugins/styles/lipstik.so
+/usr/lib/trinity/kstyle_lipstik_config.la
+/usr/lib/trinity/kstyle_lipstik_config.so
+/usr/lib/trinity/plugins/styles/lipstik.la
+/usr/lib/trinity/plugins/styles/lipstik.so
 /usr/share/apps/kstyle/themes/lipstik.themerc
 /usr/share/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
 /usr/share/apps/kdisplay/color-schemes/lipstikwhite.kcsrc