From 7f6864a3d8c5c08070dc0c60558d45b6ab5d6eaf Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 22 Oct 2007 12:03:32 +0000 Subject: [PATCH] slackware, make install: renamed bin/lazarus to bin/lazarus-ide because of conflict with tct git-svn-id: trunk@12553 - --- Makefile | 2 +- Makefile.fpc | 2 +- ide/debugoptionsfrm.pas | 2 +- tools/install/create_lazarus_slacktgz.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d4f6f8ebde..5b6f4b698b 100644 --- a/Makefile +++ b/Makefile @@ -3389,7 +3389,7 @@ install: $(COPYTREE) . $(LAZARUS_INSTALL_DIR) ifeq ($(OS_TARGET),win32) else - ln -sf $(LAZARUS_INSTALL_DIR)/lazarus $(INSTALL_PREFIX)/bin/lazarus + ln -sf $(LAZARUS_INSTALL_DIR)/lazarus $(INSTALL_PREFIX)/bin/lazarus-ide ln -sf $(LAZARUS_INSTALL_DIR)/startlazarus $(INSTALL_PREFIX)/bin/startlazarus ln -sf $(LAZARUS_INSTALL_DIR)/lazbuild $(INSTALL_PREFIX)/bin/lazbuild cat $(LAZARUS_INSTALL_DIR)/docs/lazbuild.1 | gzip > $(INSTALL_MAN_DIR)/man1/lazbuild.1.gz diff --git a/Makefile.fpc b/Makefile.fpc index 770f12b5b0..80a03d1b30 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -119,7 +119,7 @@ install: ifeq ($(OS_TARGET),win32) else - ln -sf $(LAZARUS_INSTALL_DIR)/lazarus $(INSTALL_PREFIX)/bin/lazarus + ln -sf $(LAZARUS_INSTALL_DIR)/lazarus $(INSTALL_PREFIX)/bin/lazarus-ide ln -sf $(LAZARUS_INSTALL_DIR)/startlazarus $(INSTALL_PREFIX)/bin/startlazarus ln -sf $(LAZARUS_INSTALL_DIR)/lazbuild $(INSTALL_PREFIX)/bin/lazbuild cat $(LAZARUS_INSTALL_DIR)/docs/lazbuild.1 | gzip > $(INSTALL_MAN_DIR)/man1/lazbuild.1.gz diff --git a/ide/debugoptionsfrm.pas b/ide/debugoptionsfrm.pas index 602a996295..862b0c9010 100644 --- a/ide/debugoptionsfrm.pas +++ b/ide/debugoptionsfrm.pas @@ -41,7 +41,7 @@ type { TDebuggerOptionsForm } - TDebuggerOptionsForm = class (TForm ) + TDebuggerOptionsForm = class (TForm) cmdOK: TBitBtn; cmdCancel: TBitBtn; gcbDebuggerGeneralOptions: TCheckGroup; diff --git a/tools/install/create_lazarus_slacktgz.sh b/tools/install/create_lazarus_slacktgz.sh index 882ce9513e..674c6e9568 100755 --- a/tools/install/create_lazarus_slacktgz.sh +++ b/tools/install/create_lazarus_slacktgz.sh @@ -64,7 +64,7 @@ cp -arf $SrcDir/* $BuildRoot/usr/lib/lazarus/ cp $SrcDir/images/ide_icon48x48.png $BuildRoot/usr/share/pixmaps/lazarus.png cp $SrcDir/install/lazarus.desktop $BuildRoot/usr/share/applications/lazarus.desktop - ln -sf /usr/lib/lazarus/lazarus usr/bin/lazarus + ln -sf /usr/lib/lazarus/lazarus usr/bin/lazarus-ide ln -sf /usr/lib/lazarus/startlazarus usr/bin/startlazarus ln -sf /usr/lib/lazarus/lazbuild usr/bin/lazbuild cat $SrcDir/docs/lazbuild.1 | gzip > $BuildRoot/usr/man/man1/lazbuild.1.gz