diff --git a/book/library-config.xml b/book/library-config.xml
index c06efe36fe..8cde35531f 100644
--- a/book/library-config.xml
+++ b/book/library-config.xml
@@ -1,7 +1,7 @@
As with most libraries, there is no configuration to do, save that
the library directory i.e. /opt/lib or
/usr/local/lib should appear in
-/etc/ld.so.conf so that ldd can find the shared
+/etc/ld.so.conf so that ldd can find the shared
libraries. After checking that this is the case,
/sbin/ldconfig should be run while logged in as
root.
diff --git a/gnome/gnome.ent b/gnome/gnome.ent
index 19ff12a861..94376ae8d6 100644
--- a/gnome/gnome.ent
+++ b/gnome/gnome.ent
@@ -6,75 +6,81 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
%gtk-doc;
+
%libIDL;
+
%orbit2;
+
%intltool;
+
%libbonobo;
+
%gconf;
+
%gnome-mime-data;
+
%gnome-vfs;
+
%libgnome;
+
%libart_lgpl;
+
%libglade;
+
%libgnomecanvas;
+
%libbonoboui;
+
%gnome-icon-themes;
+
%gnome-keyring;
+
%libgnomeui;
+
%gtk-engines;
+
%gnome-themes;
+
%scrollkeeper;
+
%gnome-desktop;
+
%libwnck;
+
%gnome-panel;
+
%gnome-session;
+
%vte;
+
%gnome-terminal;
+
%libgtop;
+
%gail;
+
%gstreamer;
+
%gst-plugins;
+
%gnome-applets;
+
%libgsf;
+
%libcroco;
+
%librsvg;
+
%eel;
+
%nautilus;
+
+%control-center;
+
+
+
+
@@ -101,8 +107,6 @@
-
-%control-center;
@@ -138,10 +142,6 @@
%gconf-editor;
%gdm;
-
-
-
-
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f00ae0d114..578166a661 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -11,6 +11,9 @@ who wrote what.
+April 22nd, 2004 [igor]: Moved Qt installation to
+/usr with instructions submitted by Tushar Teredesai.
+
April 22nd, 2004 [igor]: Added cracklib-2.7,
contributed by DJ Lucas.
diff --git a/x/lib/qt/qt-config.xml b/x/lib/qt/qt-config.xml
index dc0d4368cf..5287673342 100644
--- a/x/lib/qt/qt-config.xml
+++ b/x/lib/qt/qt-config.xml
@@ -3,41 +3,8 @@
Configuration Information
-As with most libraries, there is no configuration to do, save that
-the library directory /opt/qt/lib should appear
-in /etc/ld.so.conf so that ldd can find the
-shared libraries. The following command will add it if it is missing:
-
-cat >> /etc/ld.so.conf << "EOF"
-# Begin qt addition to /etc/ld.so.conf
-
-/opt/qt/lib
-
-# End qt addition
-EOF
-ldconfig
-
-You need to add the path for the Qt man pages to the
-man.conf
-file. This can be done with the following command:
-
-cat >> /etc/man.conf << "EOF"
-# Begin qt addition to man.conf
-
-MANPATH /opt/qt/doc/man
-
-# End qt addition to man.conf
-EOF
-
-Most of the Qt based applications (such as
-KDE) require the QTDIR to be
-set during compilation. This can be achieved by the following command.
-For convenience, this command may be added to /etc/profile
-or $HOME/.bash_profile.
-
-export QTDIR=/opt/qt
+&library-config;
-
diff --git a/x/lib/qt/qt-desc.xml b/x/lib/qt/qt-desc.xml
index 090f046b6c..abc6776d62 100644
--- a/x/lib/qt/qt-desc.xml
+++ b/x/lib/qt/qt-desc.xml
@@ -22,7 +22,6 @@
Qt libraryThe Qt/X11
library contains API's necessary to use
-KDE
-programs.
+programs based on Qt GUI toolkit.
diff --git a/x/lib/qt/qt-exp.xml b/x/lib/qt/qt-exp.xml
index 1d9a554676..467e48cfbd 100644
--- a/x/lib/qt/qt-exp.xml
+++ b/x/lib/qt/qt-exp.xml
@@ -1,54 +1,51 @@
Command explanations
+sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf:
+install is safer than cp when
+libraries are in use.
+
bash: This command enters a sub-shell to isolate
environment changes.
-export QTDIR=$PWD: This command defines where the
-root of the Qt directory is located.
-
-export LD_LIBRARY_PATH=$QTDIR/lib: This command
+export LD_LIBRARY_PATH=$PWD/lib: This command
sets up the location of libraries for the build process.
-export PATH=$QTDIR/bin:$PATH: This command
+export PATH=$PWD/bin:$PATH: This command
allows the build process to find supporting executables.
--prefix /opt/qt-&qt-version;: This command sets up
-the install destination.
-
-: This command adds support for gif
+-qt-gif: This switch adds support for gif
files to the libraries.
-: This command forces the library to use the
-shared libraries that are on your system instead of recreating its own
-set of support libraries for these functions.
+-system-zlib -system-libpng: This switch
+forces the library to use the shared libraries that are on your system
+instead of recreating its own set of support libraries for these
+functions.
-: This command disables
+-no-g++-exceptions: This switch disables
the exceptions coding generated by the C++ compiler.
-: This command compiles the library
-to support multi-threading.
+-thread: This switch adds
+support for multi-threading.
-ln -sfn qt-&qt-version; /opt/qt: This command
-standardizes the location of the Qt libraries
-to the ld.so.conf entry
-described below.
+find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g":
+This command removes hardcoded run-time path, else
+uic tries to run with system installed Qt
+libraries.
-ln -s libqt-mt.so /opt/qt/lib/libqt.so: This
+ln -s libqt-mt.so /usr/lib/libqt.so: This
command allows configure scripts
to find a working Qt installation.
-cp -r doc/man /opt/qt/doc: This command
-installs the man directory which is missed by make
+cp -r doc/man /usr/share: This command
+installs the man pages which are missed by make
install.
-cp -r examples /opt/qt/doc: This command
-installs the examples directory which is missed by make
+cp -r examples /usr/share/doc/qt: This command
+installs the examples which are missed by make
install.exit: This command returns to the parent shell
-and eliminates envirnment variables set earlier.
+and eliminates environment variables set earlier.
-
diff --git a/x/lib/qt/qt-inst.xml b/x/lib/qt/qt-inst.xml
index 709b86ad91..7ca350a6f5 100644
--- a/x/lib/qt/qt-inst.xml
+++ b/x/lib/qt/qt-inst.xml
@@ -1,19 +1,24 @@
Installation of <application>Qt</application>
-bash
-export QTDIR=$PWD &&
-export LD_LIBRARY_PATH=$QTDIR/lib &&
-export PATH=$QTDIR/bin:$PATH &&
-./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
- -system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
- -thread &&
+Install Qt by running the following
+commands:
+
+sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf &&
+bash
+export PATH=$PWD/bin:$PATH &&
+export LD_LIBRARY_PATH=$PWD/lib &&
+./configure -prefix /usr -docdir /usr/share/doc/qt \
+ -headerdir /usr/include/qt -plugindir /usr/lib/qt/plugins \
+ -datadir /usr/share/qt -translationdir /usr/share/qt/translations \
+ -sysconfdir /etc/qt -release -shared -qt-gif -system-zlib \
+ -no-g++-exceptions -thread -plugin-imgfmt-png -system-libpng &&
make &&
+find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g" &&
make install &&
-ln -sfn qt-&qt-version; /opt/qt &&
-ln -s libqt-mt.so /opt/qt/lib/libqt.so &&
-cp -r doc/man /opt/qt/doc &&
-cp -r examples /opt/qt/doc
+ln -sf libqt-mt.so /usr/lib/libqt.so &&
+cp -r doc/man /usr/share &&
+cp -r examples /usr/share/doc/qt &&
exit
@@ -26,3 +31,12 @@ The build time for Qt is quite long. If you want to
+
+
diff --git a/x/lib/qt/qt-intro.xml b/x/lib/qt/qt-intro.xml
index 534412e40c..0fa7f6b6d8 100644
--- a/x/lib/qt/qt-intro.xml
+++ b/x/lib/qt/qt-intro.xml
@@ -17,11 +17,20 @@ are dynamically linked to the Qt library.
<application>Qt</application> dependenciesRequired
- and
-
+
+
+Optional
- and
+
+,
+,
+,
+,
+,
+,
+Firebird and
+unixODBC
+