From a6e15437fe5fc54f3b378d188e62f0baaca6c55f Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 24 Jul 2012 20:05:16 +0000 Subject: [PATCH] deb,rpm: cleaned up usechmhelp git-svn-id: trunk@38035 - --- tools/install/create_lazarus_deb.sh | 3 --- tools/install/create_lazarus_rpm.sh | 2 -- tools/install/rpm/lazarus.spec.template | 1 - 3 files changed, 6 deletions(-) diff --git a/tools/install/create_lazarus_deb.sh b/tools/install/create_lazarus_deb.sh index bc4d83cc83..049ebf8537 100755 --- a/tools/install/create_lazarus_deb.sh +++ b/tools/install/create_lazarus_deb.sh @@ -127,9 +127,6 @@ MAKEOPTS="-Fl/opt/gnome/lib" if [ -n "$FPCCfg" ]; then MAKEOPTS="$MAKEOPTS -n @$FPCCfg" fi -if [ "$UseCHMHelp" = "1" ]; then - MAKEOPTS="$MAKEOPTS -dUseCHMHelp" -fi echo "MAKEOPTS=$MAKEOPTS" # build export LCL_PLATFORM=$LCLWidgetset diff --git a/tools/install/create_lazarus_rpm.sh b/tools/install/create_lazarus_rpm.sh index 77a3b9d494..0994a8b1ad 100755 --- a/tools/install/create_lazarus_rpm.sh +++ b/tools/install/create_lazarus_rpm.sh @@ -71,7 +71,6 @@ echo "creating lazarus tgz ..." # create spec file echo "creating lazarus spec file ..." CHMCOMMENT="# " -if [ "$UseCHMHelp" = "1" ]; then CHMCOMMENT=""; fi cat rpm/lazarus.spec.template | \ sed -e "s/LAZVERSION/$LazVersion/g" \ -e "s/LAZRELEASE/$LazRelease/g" \ @@ -79,7 +78,6 @@ cat rpm/lazarus.spec.template | \ -e "s/FPCBUILDVERSION/2.6.1/g" \ -e "s/FPCVERSION/$FPCRPMVersion/g" \ -e "s/FPCSRCVERSION/$FPCSRCRPMVersion/g" \ - -e "s/%CHMHELP:/$CHMCOMMENT/" \ > $SpecFile # build rpm diff --git a/tools/install/rpm/lazarus.spec.template b/tools/install/rpm/lazarus.spec.template index b9cc0c1a74..baa1dd3a73 100644 --- a/tools/install/rpm/lazarus.spec.template +++ b/tools/install/rpm/lazarus.spec.template @@ -33,7 +33,6 @@ MAKEOPTS="-Fl/opt/gnome/lib" if [ -n "$FPCCfg" ]; then MAKEOPTS="$MAKEOPTS -n @$FPCCfg" fi -#CHMHELP:MAKEOPTS="$MAKEOPTS -dUseCHMHelp" make bigide OPT="$MAKEOPTS" USESVN2REVISIONINC=0 export LCL_PLATFORM= strip lazarus