From kde-core-devel  Wed Oct 30 22:40:18 2002
From: Helge Deller <deller () gmx ! de>
Date: Wed, 30 Oct 2002 22:40:18 +0000
To: kde-core-devel
Subject: kcontrol/infocenter patch (2nd try)
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=103601772403522
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary-00=_S/Fw9eRwwDuOitX"


--Boundary-00=_S/Fw9eRwwDuOitX
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Wednesday 30 October 2002 23:20, Helge Deller wrote:
> Running "make install" in kdebase/kcontrol/kcontrol produces currently the
> following "Error" if KDE hasn't been installed yet:
>
> rm: cannot remove `/opt/kde/bin/kinfocenter': No such file or directory
> make[4]: [install-data-local] Error 1 (ignored)
>
> The attached patch fixes this for me.
> Ok to commit ?
>
> Helge

Ok, the first patch was wrong and only copied the libtool helper file instead
of the symlink. This version should work correctly.

Ok ?

Helge


--Boundary-00=_S/Fw9eRwwDuOitX
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff"

Index: Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kcontrol/Makefile.am,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile.am
--- Makefile.am	2002/09/20 19:49:08	1.60
+++ Makefile.am	2002/10/30 22:39:23
@@ -22,7 +22,7 @@ METASOURCES = AUTO
 
 SUBDIRS = . pics
 
-CLEANFILES = dummy.cpp
+CLEANFILES = dummy.cpp kinfocenter
 
 bin_PROGRAMS = kcontrol kcmshell kcminit
 lib_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la
@@ -67,11 +67,12 @@ rcinfo_DATA = kinfocenterui.rc
 data_DATA = KControl.desktop
 datadir = $(kde_appsdir)/Settingsmenu
 
-install-data-local: KControl_NoDisplay.desktop
+$(DESTDIR)$(kde_bindir)/kinfocenter:
+	$(LN_S) kcontrol $(DESTDIR)$(kde_bindir)/kinfocenter
+
+install-data-local: KControl_NoDisplay.desktop $(DESTDIR)$(kde_bindir)/kinfocenter
 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)
 	$(INSTALL_DATA) $(srcdir)/KControl_NoDisplay.desktop $(DESTDIR)$(kde_appsdir)/KControl.desktop
-	@-rm $(DESTDIR)$(kde_bindir)/kinfocenter
-	@$(LN_S) kcontrol $(DESTDIR)$(kde_bindir)/kinfocenter
 	$(INSTALL_DATA) $(srcdir)/kinfocenter.desktop $(DESTDIR)$(kde_appsdir)/System/
 
 KDE_ICON=AUTO

--Boundary-00=_S/Fw9eRwwDuOitX--