From 8d5d36e8a255ad99b7ffdfed3ad081869909619a Mon Sep 17 00:00:00 2001
From: Fritz Elfert <felfert@to.com>
Date: Thu, 11 Jul 2002 04:02:43 +0000
Subject: *** empty log message ***

---
 conf/m4/kde/AC_CREATE_KFSSTND.m4 |  5 -----
 conf/m4/kde/AC_PATH_KDE.m4       |  5 +++++
 kde2/doc/en/index.docbook.in     | 34 ++++++++++++++++------------------
 kde2/kpsion/Makefile.am          |  4 ++--
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/conf/m4/kde/AC_CREATE_KFSSTND.m4 b/conf/m4/kde/AC_CREATE_KFSSTND.m4
index 66b47c5..de4653c 100644
--- a/conf/m4/kde/AC_CREATE_KFSSTND.m4
+++ b/conf/m4/kde/AC_CREATE_KFSSTND.m4
@@ -89,9 +89,4 @@ else
   AC_MSG_RESULT($kde_result)
 fi
 
-save_BINDIR=$bindir
-bindir=$kde_bindir
-KDE_SUBST_PROGRAMS
-bindir=$save_BINDIR
-
 ])
diff --git a/conf/m4/kde/AC_PATH_KDE.m4 b/conf/m4/kde/AC_PATH_KDE.m4
index d49c45a..aa8ee19 100644
--- a/conf/m4/kde/AC_PATH_KDE.m4
+++ b/conf/m4/kde/AC_PATH_KDE.m4
@@ -13,6 +13,11 @@ AC_DEFUN(AC_PATH_KDE,[
 	)
 
 	AC_CREATE_KFSSTND($ac_use_path_checking)
+	save_BINDIR=$bindir
+	bindir=$kde_bindir
+	KDE_SUBST_PROGRAMS
+	bindir=$save_BINDIR
+	KDE_SUBST_PROGRAMS
 
 	AC_SUBST_KFSSTND
 	KDE_CREATE_LIBS_ALIASES
diff --git a/kde2/doc/en/index.docbook.in b/kde2/doc/en/index.docbook.in
index 10412df..a859b58 100644
--- a/kde2/doc/en/index.docbook.in
+++ b/kde2/doc/en/index.docbook.in
@@ -1,13 +1,11 @@
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook V3.1-Based Variant V1.0//EN" [
-  <!ENTITY kpsion  "<application>KPsion</application>"
-    -- delete this, if kpsion is in global KDE entities -->
-  <!ENTITY kappname "&kpsion;" -- this only *seems* redundant -->
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+  <!ENTITY kpsion  "<application>KPsion</application>">
+  <!ENTITY kappname "&kpsion;">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE">
-  <!ENTITY % ents PUBLIC "-//KDE//ENTITIES Documentation V1.0//EN">
+  <!ENTITY % German "INCLUDE">
   <!-- DO NOT DELETE! $Revision$ -->
   <!-- DO NOT DELETE! $Date$ -->
-  %ents;
 ]>
 
 <book lang="&language;">
@@ -199,7 +197,7 @@ This option starts format of the specified <replaceable>DRIVE</replaceable>.
 <screeninfo>&kpsion; mainwindow.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="toplevel.png" format="PNG">
+      <imagedata fileref="toplevel.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>&kpsion; mainwindow</phrase>
@@ -217,7 +215,7 @@ toolbar buttons. These are:</para>
 <guiicon>
   <inlinemediaobject>
     <imageobject>
-      <imagedata fileref="psion_backup.png" format="PNG">
+      <imagedata fileref="psion_backup.png" format="PNG"></imagedata>
     </imageobject>
   </inlinemediaobject>
 </guiicon> Full backup.
@@ -226,7 +224,7 @@ toolbar buttons. These are:</para>
 <guiicon>
   <inlinemediaobject>
     <imageobject>
-      <imagedata fileref="psion_restore.png" format="PNG">
+      <imagedata fileref="psion_restore.png" format="PNG"></imagedata>
     </imageobject>
   </inlinemediaobject>
 </guiicon> Restore.
@@ -326,7 +324,7 @@ is divided into three steps:
 <screeninfo>Step one. Select a backup directory.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="firstwizard-1.png" format="PNG">
+      <imagedata fileref="firstwizard-1.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>Selecting the backup directory</phrase>
@@ -350,7 +348,7 @@ to do so.
 <screeninfo>Step two. backup strategy.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="firstwizard-2.png" format="PNG">
+      <imagedata fileref="firstwizard-2.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>Setting the backup strategy</phrase>
@@ -380,7 +378,7 @@ are more backup generations available and delete older backup generations.
 <screeninfo>Step three. connection parameters.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="firstwizard-3.png" format="PNG">
+      <imagedata fileref="firstwizard-3.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>Setting connection parameters</phrase>
@@ -417,7 +415,7 @@ backed up when running in unattended backup mode.
 <screeninfo>Step one. psion name.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="newpsionwizard-1.png" format="PNG">
+      <imagedata fileref="newpsionwizard-1.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>Setting a psion name</phrase>
@@ -437,7 +435,7 @@ displaying the machine's name when connected.
 <screeninfo>Step two. specifying backup drives.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="newpsionwizard-2.png" format="PNG">
+      <imagedata fileref="newpsionwizard-2.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>Specifying backup drives</phrase>
@@ -467,7 +465,7 @@ consists of three tabs:
 <screeninfo>Setup, Backup.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="settings-backup.png" format="PNG">
+      <imagedata fileref="settings-backup.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>Settings, Backup</phrase>
@@ -485,7 +483,7 @@ consists of three tabs:
 <screeninfo>Settings, Connection.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="settings-connection.png" format="PNG">
+      <imagedata fileref="settings-connection.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>Settings, Connection</phrase>
@@ -503,7 +501,7 @@ consists of three tabs:
 <screeninfo>Settings, Machines.</screeninfo>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="settings-machines.png" format="PNG">
+      <imagedata fileref="settings-machines.png" format="PNG"></imagedata>
     </imageobject>
     <textobject>
       <phrase>Settings, Machines</phrase>
diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am
index 693334c..51e748c 100644
--- a/kde2/kpsion/Makefile.am
+++ b/kde2/kpsion/Makefile.am
@@ -23,11 +23,11 @@ libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \
 	statusbarprogress.cpp kpsionconfig.cpp kpsionbackuplistview.cpp \
 	kpsionrestoredialog.cpp
 
-libkpsion_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT)
+libkpsion_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_QT)
 
 kpsion_SOURCES	= main.cpp
 kpsion_LDFLAGS  = $(KDE_RPATH)
-kpsion_LDADD	= libkpsion.la $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT)
+kpsion_LDADD	= libkpsion.la $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_QT)
 
 applnk_DATA = kpsion.desktop
 applnkdir = $(kde_appsdir)/Utilities
-- 
cgit v1.2.3