8 files changed, 46 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 73cbc0f..1fc21cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ maintainer-clean-local:
 
 dist-hook:
 	$(MAKE) TMPDEST=$(distdir)/ kdoc specfile
+	$(MAKE) -C $(distdir)/kde2 -f Makefile.am am_edit
 
 kdoc:
 	kdoc -d $(TMPDEST)doc/api -n libplp $(TMPDEST)lib/*.h
diff --git a/conf/am_edit b/conf/am_edit
index bab2c27..d597c9e 100644
--- a/conf/am_edit
+++ b/conf/am_edit
@@ -128,6 +128,11 @@ while (defined ($ARGV[0]))
         warn ("$thisProg doesn't exist\n")      if (!(-f $thisProg));
         $pathoption=1;
     }
+    elsif (/^-t\s*(.+)$|^--topdir=(.+)$/)
+    {
+        $KDEtopdir = $1 if($1);
+        $KDEtopdir = $2 if($2);
+    }
     elsif (/^--help$|^-h$/)
     {
         print STDOUT "Usage $thisProg [OPTION] ... [dir/Makefile.in]...\n",
@@ -281,7 +286,7 @@ sub processMakefile ($)
     tag_ICON();
 
     my $tmp = "force-reedit:\n";
-    $tmp   .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
+    $tmp   .= "\t$automkCall\n\tcd \$(top_srcdir)/$KDEtopdir && perl $thisProg $printname\n\n";
     appendLines($tmp);
 
     make_meta_classes();
@@ -742,7 +747,7 @@ sub tag_AUTOMAKE ()
     return 1    if ($MakefileData !~ /($lookup)/);
     print STDOUT "AUTOMAKE processing <$1>\n"        if ($verbose);
 
-    my $newLine = $1."\n\tcd \$(top_srcdir) && perl $thisProg $printname";
+    my $newLine = $1."\n\tcd \$(top_srcdir)/$KDEtopdir && perl $thisProg $printname";
     substituteLine ($lookup, $newLine);
     $automkCall = $1;
     return 0;
diff --git a/etc/plptools.spec.in b/etc/plptools.spec.in
index c939a88..6e962ba 100644
--- a/etc/plptools.spec.in
+++ b/etc/plptools.spec.in
@@ -21,7 +21,7 @@ Requires: %{name} = %{version}
 %package kde
 Summary: Psion support for KDE 2.1.
 Group: User Interface/Desktops
-Requires: %{name} = %{version}
+Requires: %{name} = %{version} kdelibs >= 2.1 qt >= 2.2.4
 
 %description
 This package contains the programs (client and server), necessary to
@@ -65,6 +65,19 @@ für Konqueror's Datei-Eigenschaften-Dialog Informationen über proprietäre
 Psion-Dateiattribute und stellt Informationen zum Gerät sowie seiner
 Laufwerke zur Verfügung.
 
+%package -n kpsion
+Summary: Psion utility for KDE 2.1.
+Group: User Interface/Desktops
+Requires: %{name} = %{version} kdelibs >= 2.1 qt >= 2.2.4
+
+%description -n kpsion
+This package contains a KDE utility program for backup, restore and formatting
+Psion drives.
+
+%description -l de -n kpsion
+Dieses Packet enthält ein KDE werkzeug zum Backup, Restore und Farmatieren
+von Psion Laufwerken.
+
 %changelog
 * Thu Mar  1 2001 Fritz Elfert <fritz.elfert@to.com>
 - Added KDE sub-packages
@@ -110,11 +123,13 @@ fi
 
 %files
 %doc COPYING INSTALL CHANGES README* TODO etc/*magic patches
-%{_bindir}/*
+%{_bindir}/plpftp
+%{_bindir}/plpbackup
 %{_sbindir}/*
 %{_mandir}/*/*
 %{_libdir}/libplp.so*
 %{_libdir}/libplp.la
+%{_datadir}/locale/*/LC_MESSAGES/plptools.mo
 %config /etc/rc.d/init.d/psion
 
 %files devel
@@ -127,3 +142,14 @@ fi
 %{_libdir}/kio_plp.la
 %{_libdir}/libplpprops.so*
 %{_libdir}/libplpprops.la
+%{_datadir}/services/*
+%{_datadir}/locale/*/LC_MESSAGES/libplpprops.mo
+%{_datadir}/mimelnk/*/*
+
+%files -n kpsion
+%{_bindir}/kpsion
+%{_libdir}/libkpsion.*
+%{_datadir}/applnk/*/*
+%{_datadir}/apps/*/*
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/LC_MESSAGES/kpsion.mo
diff --git a/kde2/Makefile.am b/kde2/Makefile.am
index 487fd84..5d24666 100644
--- a/kde2/Makefile.am
+++ b/kde2/Makefile.am
@@ -12,4 +12,4 @@ maintainer-clean-local:
 	rm -f Makefile.in
 
 am_edit:
-	perl ../conf/am_edit
+	perl ../conf/am_edit --topdir=kde2
diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am
index 85f70fa..6cbc731 100644
--- a/kde2/kpsion/Makefile.am
+++ b/kde2/kpsion/Makefile.am
@@ -21,9 +21,11 @@ kpsion_LDADD	= libkpsion.la $(top_srcdir)/lib/libplp.la
 
 applnk_DATA = kpsion.desktop
 applnkdir = $(kde_appsdir)/Utilities
+EXTRA_DIST += kpsion.desktop
 
 rcdir = $(kde_datadir)/kpsion
 rc_DATA = kpsionui.rc
+EXTRA_DIST += kpsionui.rc
 
 noinst_HEADERS = kpsion.h setupdialog.h wizards.h
 
diff --git a/kde2/plugins/Makefile.am b/kde2/plugins/Makefile.am
index 844ebc8..d2ccdfa 100644
--- a/kde2/plugins/Makefile.am
+++ b/kde2/plugins/Makefile.am
@@ -15,7 +15,7 @@ noinst_HEADERS = plpprops.h plppropsFactory.h pie3dpiece.h pie3dwidget.h
 
 services_DATA = plpprops.desktop
 servicesdir = $(kde_servicesdir)
-
+EXTRA_DIST += $(services_DATA)
 
 messages:
 	$(XGETTEXT) -C -ki18n -kI18N_NOOP -ktranslate -kaliasLocale *.cc *.cpp *.h && mv messages.po ../po/libplpprops.pot
diff --git a/kde2/po/de/libplpprops.po b/kde2/po/de/libplpprops.po
index 169bef2..8741d94 100644
--- a/kde2/po/de/libplpprops.po
+++ b/kde2/po/de/libplpprops.po
@@ -1,12 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Messages for plptools.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Fritz Elfert <felfert@to.com>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: plptools 0.8\n"
 "POT-Creation-Date: 2001-03-01 06:04+0100\n"
-"PO-Revision-Date: 2001-03-01 06:20CET\n"
+"PO-Revision-Date: 2001-03-02 04:32CET\n"
 "Last-Translator: Fritz Elfert <felfert@to.com>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/po/.cvsignore b/po/.cvsignore
index 25fdb73..d4d149d 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -4,3 +4,4 @@ stamp-cat-id
 POTFILES
 *.c
 *.gmo
+*.pot