From edb9650a0deee1426f9fade5db5d0e0fd6a0e06e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 6 Oct 2018 22:06:01 +0900 Subject: [PATCH] Moved to /usr folder instead of /opt/trinity. This relates to bug 266. Signed-off-by: Michele Calgaro --- dcopperl/Makefile.PL | 4 ++-- kalyptus/kalyptus.spec.in | 2 +- kjsembed/docs/examples/imageinfo/imagescale.js | 2 +- qtruby/INSTALL | 2 +- tdejava/koala.kdevprj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dcopperl/Makefile.PL b/dcopperl/Makefile.PL index af1a3d14..807c6f49 100644 --- a/dcopperl/Makefile.PL +++ b/dcopperl/Makefile.PL @@ -4,8 +4,8 @@ use Config; # the contents of the Makefile that is written. print "Trying to find some configuration information...\n"; -my $tde_dirs = $ENV{TDEDIRS} || '/opt/trinity'; -my $qt_dir = $ENV{TQTDIR} || '/opt/trinity/lib'; +my $tde_dirs = $ENV{TDEDIRS} || '/usr'; +my $qt_dir = $ENV{TQTDIR} || '/usr/lib'; my $tde_inc = "$tde_dirs/include"; my $tde_lib = "$tde_dirs/lib"; my $qt_inc = "$qt_dir/include"; diff --git a/kalyptus/kalyptus.spec.in b/kalyptus/kalyptus.spec.in index 6fdf86fb..4260a625 100644 --- a/kalyptus/kalyptus.spec.in +++ b/kalyptus/kalyptus.spec.in @@ -1,6 +1,6 @@ # You might want to change the next 2 lines, the rest should be ok %define qtdir /usr/lib/qt-3.0.0 -Prefix: /opt/trinity +Prefix: /usr Name: kalyptus Icon: kde-icon.xpm diff --git a/kjsembed/docs/examples/imageinfo/imagescale.js b/kjsembed/docs/examples/imageinfo/imagescale.js index d0921cd9..996144f1 100644 --- a/kjsembed/docs/examples/imageinfo/imagescale.js +++ b/kjsembed/docs/examples/imageinfo/imagescale.js @@ -1,4 +1,4 @@ -#!/opt/trinity/bin/kjscmd +#!/usr/bin/kjscmd // // Load an image, scale it, and save it in the specified format. diff --git a/qtruby/INSTALL b/qtruby/INSTALL index 94fc7787..c4165afb 100644 --- a/qtruby/INSTALL +++ b/qtruby/INSTALL @@ -28,7 +28,7 @@ To build the Qt.so extension, provide 'extconf.rb' with the directories where the Qt and Smoke libraries are installed: $ cd qtruby/rubylib/qtruby -$ ruby extconf.rb --with-smoke-dir=/opt/trinity \ +$ ruby extconf.rb --with-smoke-dir=/usr \ --with-qt-dir=/home/duke/src/kde/HEAD/qt-copy $ make $ make install diff --git a/tdejava/koala.kdevprj b/tdejava/koala.kdevprj index 1dbf6985..d07cf954 100644 --- a/tdejava/koala.kdevprj +++ b/tdejava/koala.kdevprj @@ -80,7 +80,7 @@ install_location= type=DATA [Workspace_1] -browser_file=file:/opt/trinity/share/doc/tde/HTML/default/tdevelop/about/intro.html +browser_file=file:/usr/share/doc/tde/HTML/default/tdevelop/about/intro.html cpp_file=/local/src/kde/tdebindings/tdejava/koala/tdejava/KKeyChooser.cpp header_file=Untitled.h openfiles=Untitled.h,Untitled.cpp,/local/src/kde/tdebindings/tdejava/koala/main.cpp,/local/src/kde/tdebindings/tdejava/koala/tdejava/TDEIO.cpp,/local/src/kde/tdebindings/tdejava/koala/tdejava/KKeyChooser.cpp