Avoid errors during fresh install of kdebase

[Ingo Klöcker]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

when you install kdebase (compiled from cvs) for the first time you get
the following confusing error messages:

rm: cannot remove `/opt/kde-cvs/bin/kinfocenter': No such file or directory
make[4]: [install-data-local] Error 1 (ignored)
rm: cannot remove `//opt/kde-cvs/sbin/filesharelist': No such file or directory
make[4]: [install-exec-hook] Error 1 (ignored)


The following patch avoids these error messages (I think):

Index: kcontrol/fileshare/Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/fileshare/Makefile.am,v
retrieving revision 1.7
diff -u -3 -p -r1.7 Makefile.am
- --- kcontrol/fileshare/Makefile.am      2002/07/27 14:28:03     1.7
+++ kcontrol/fileshare/Makefile.am      2002/09/14 16:33:01
@@ -19,6 +19,6 @@ datadir = $(kde_appsdir)/Settings/System

 sbin_SCRIPTS = fileshareset
 install-exec-hook:
- -       @-rm $(DESTDIR)/$(sbindir)/filesharelist
+       @-rm -f $(DESTDIR)/$(sbindir)/filesharelist
        @$(LN_S) fileshareset $(DESTDIR)/$(sbindir)/filesharelist
        @(chown root $(DESTDIR)/$(sbindir)/fileshareset && chmod 4755 $(DESTDIR)/$(sbindir)/fileshareset) || echo "Was not able to make fileshareset setuid root"
Index: kcontrol/kcontrol/Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kcontrol/Makefile.am,v
retrieving revision 1.58
diff -u -3 -p -r1.58 Makefile.am
- --- kcontrol/kcontrol/Makefile.am       2002/07/31 09:45:40     1.58
+++ kcontrol/kcontrol/Makefile.am       2002/09/14 16:33:02
@@ -68,7 +68,7 @@ datadir = $(kde_appsdir)/Settingsmenu
 install-data-local: KControl_NoDisplay.desktop
        $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)
        $(INSTALL_DATA) $(srcdir)/KControl_NoDisplay.desktop $(DESTDIR)$(kde_appsdir)/KControl.desktop
- -       @-rm $(DESTDIR)$(kde_bindir)/kinfocenter
+       @-rm -f $(DESTDIR)$(kde_bindir)/kinfocenter
        @$(LN_S) kcontrol $(DESTDIR)$(kde_bindir)/kinfocenter
        $(INSTALL_DATA) $(srcdir)/kinfocenter.desktop $(DESTDIR)$(kde_appsdir)/System/


Regards,
Ingo

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE9g2acGnR+RTDgudgRAtTFAKCqWfP2/nDr7i2XExupIpW1aVFl8wCbBjOq
zYShnJiXQDfQeO9+v6OOBXQ=
=4sxp
-----END PGP SIGNATURE-----