diff options
| author | Fritz Elfert <felfert@to.com> | 2002-07-18 05:20:32 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2002-07-18 05:20:32 +0000 |
| commit | 4994d8c3435a66686345b76303420eaffef45301 (patch) | |
| tree | e4d76f46666196bb38a9b7042bb6a872f566a1ba /conf | |
| parent | e971871af853c19afd99df4ce5c2ad0f736356a8 (diff) | |
| download | plptools-4994d8c3435a66686345b76303420eaffef45301.tar.gz plptools-4994d8c3435a66686345b76303420eaffef45301.tar.bz2 plptools-4994d8c3435a66686345b76303420eaffef45301.zip | |
- Update KDEHelp's cache after installing kioslave docs
- Fix in autodetection of qt
- Added START_NCPD to config files, changed initscripts accordingly.
- Lot of tweaks in RPM specfile for Mandrake 8.2
- On old RedHat 7.2 with KDE2, /lib/qt2 does not exist, use QTDIR
- Fixed some dscriptions in specfile
- Removed mgetty cruft in initscripts
- XML related fixes in kioslave doc
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/kiodoc-update.pl | 12 | ||||
| -rw-r--r-- | conf/m4/kde/AC_PATH_QT_1_3.m4 | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/conf/kiodoc-update.pl b/conf/kiodoc-update.pl index 6e7a792..a6acf9f 100644 --- a/conf/kiodoc-update.pl +++ b/conf/kiodoc-update.pl @@ -34,6 +34,12 @@ sub usage { die "Usage: kiodoc-update -a|-r kioslaveName"; } +sub update_cache($) { + my $cache = $_[0]; + $cache =~ s/index\.docbook/index\.cache\.bz2/; + system("meinproc --check --cache $cache $_[0]"); +} + sub add_doc($) { my @files = collect_specified($_[0]); return if ($#files lt 0); @@ -43,7 +49,7 @@ sub add_doc($) { my $ed = '<!ENTITY kio-' . $id . ' SYSTEM "' . "$_[0].docbook" . '">'; my $er = '&kio-' . $id . ';'; - $idx =~ s/$_[0].docbook/index.docbook/; + $idx =~ s/$_[0]\.docbook/index\.docbook/; my @lines = from("$idx"); my $state = 0; my @out = (); @@ -77,6 +83,7 @@ sub add_doc($) { open(F, ">$idx") || die "Can't open $idx for write: $!\n"; print F @out; close(F); + update_cache($idx); } } @@ -85,12 +92,13 @@ sub remove_doc($) { return if ($#files lt 0); my $re = "kio-" . get_id($files[0]) . '[\s;]'; foreach $idx (@files) { - $idx =~ s/$_[0].docbook/index.docbook/; + $idx =~ s/$_[0]\.docbook/index\.docbook/; my @lines = from($idx); @lines = grep(!/$re/, @lines); open(F, ">$idx") || die "Can't open $idx for write: $!\n"; print F join("\n", @lines) . "\n"; close(F); + update_cache($idx); } } diff --git a/conf/m4/kde/AC_PATH_QT_1_3.m4 b/conf/m4/kde/AC_PATH_QT_1_3.m4 index 81a6b96..f252c9e 100644 --- a/conf/m4/kde/AC_PATH_QT_1_3.m4 +++ b/conf/m4/kde/AC_PATH_QT_1_3.m4 @@ -68,7 +68,7 @@ AC_DEFUN(AC_PATH_QT_1_3,[ qt_libdir=NONE for dir in $qt_libdirs; do - try="ls -1 $dir/libqt*" + try="ls -1 $dir/libqt.*so" if eval $try >/dev/null 2>&1 ; then qt_libdir=$dir; break; |