diff options
| -rw-r--r-- | acinclude.m4 | 40 | ||||
| -rw-r--r-- | src/gvdirpart/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gvimagepart/Makefile.am | 2 | ||||
| -rw-r--r-- | src/spec/gwenview-SuSE.spec | 16 | ||||
| -rw-r--r-- | src/spec/gwenview-mdk.spec | 2 |
5 files changed, 31 insertions, 31 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 660b345..4512c24 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -479,14 +479,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/kde' @@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ - 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 @@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) - kde32ornewer=1 - kde33ornewer=1 + trinity2ornewer=1 + trinity3ornewer=1 if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - kde32ornewer= - kde33ornewer= + trinity2ornewer= + trinity3ornewer= else if test "$kde_qtver" = "3"; then if test "$kde_qtsubver" -le 1; then - kde32ornewer= + trinity2ornewer= fi if test "$kde_qtsubver" -le 2; then - kde33ornewer= + trinity3ornewer= fi if test "$KDECONFIG" != "compiled"; then if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then - kde33ornewer= + trinity3ornewer= fi fi fi fi - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi - if test -n "$kde33ornewer"; then + if test -n "$trinity3ornewer"; then KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$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 @@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' AC_SUBST(KCONFIG_COMPILER) @@ -1784,7 +1784,7 @@ fi if test -z "$1"; then -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" +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" 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) @@ -1796,7 +1796,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="$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}" +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}" 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) @@ -1804,7 +1804,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([ @@ -1812,14 +1812,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/src/gvdirpart/Makefile.am b/src/gvdirpart/Makefile.am index ecae224..da2fcad 100644 --- a/src/gvdirpart/Makefile.am +++ b/src/gvdirpart/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(srcdir)/.. $(all_includes) # These are not really libraries, but modules dynamically opened. -# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3 +# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity kde_module_LTLIBRARIES = libgvdirpart.la libgvdirpart_la_SOURCES = gvdirpart.cpp gvdirpartconfig.kcfgc diff --git a/src/gvimagepart/Makefile.am b/src/gvimagepart/Makefile.am index b50016b..2fed737 100644 --- a/src/gvimagepart/Makefile.am +++ b/src/gvimagepart/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(srcdir)/.. $(all_includes) # These are not really libraries, but modules dynamically opened. -# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3 +# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity kde_module_LTLIBRARIES = libgvimagepart.la libgvimagepart_la_SOURCES = gvimagepart.cpp diff --git a/src/spec/gwenview-SuSE.spec b/src/spec/gwenview-SuSE.spec index 2d90254..64356a6 100644 --- a/src/spec/gwenview-SuSE.spec +++ b/src/spec/gwenview-SuSE.spec @@ -24,7 +24,7 @@ rm -rf $RPM_BUILD_ROOT %setup %build -./configure --prefix=$RPM_BUILD_ROOT/opt/kde3 --enable-final +./configure --prefix=$RPM_BUILD_ROOT/opt/trinity --enable-final make %install @@ -32,13 +32,13 @@ make install %files %defattr(-,root,root,0755) -/opt/kde3/bin/gwenview -/opt/kde3/share/apps/gwenview/icons/*/*/actions/*.png -/opt/kde3/share/icons/*/*/apps/gwenview.png -/opt/kde3/share/applnk/Graphics/gwenview.desktop -/opt/kde3/share/apps/konqueror/servicemenus/konqgwenview.desktop -/opt/kde3/share/locale/*/LC_MESSAGES/gwenview.mo -/opt/kde3/man/man1/gwenview.1 +/opt/trinity/bin/gwenview +/opt/trinity/share/apps/gwenview/icons/*/*/actions/*.png +/opt/trinity/share/icons/*/*/apps/gwenview.png +/opt/trinity/share/applnk/Graphics/gwenview.desktop +/opt/trinity/share/apps/konqueror/servicemenus/konqgwenview.desktop +/opt/trinity/share/locale/*/LC_MESSAGES/gwenview.mo +/opt/trinity/man/man1/gwenview.1 %doc NEWS README TODO ChangeLog COPYING CREDITS %clean diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec index 3db8ec0..70e4380 100644 --- a/src/spec/gwenview-mdk.spec +++ b/src/spec/gwenview-mdk.spec @@ -162,7 +162,7 @@ ln -s %_datadir/icons/hicolor/16x16/apps/%{gvname}.png %buildroot/%_miconsdir %_datadir/doc/HTML/* %_mandir/man1/%{gvname}.1.bz2 -%_libdir/kde3/* +%_libdir/trinity/* %_libdir/libkdeinit_%{gvname}.so %_libdir/libkdeinit_%{gvname}.la |