From 6b648f5dde39b172261298573f7b6b7bf4ad1bf7 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 29 Jul 2001 22:14:10 +0000
Subject: [PATCH]   * don't set FPC to PPNEW because PPNEW gets deleted first

---
 Makefile.fpc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.fpc b/Makefile.fpc
index 9d2a79c7c7..07650edc27 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -29,7 +29,6 @@ PPNEW=$(BASEDIR)/compiler/ppc386$(SRCEXEEXT)
 # Check if there is already a ppc386 binary in compiler, then
 # we will use that version for target and version info
 ifneq ($(wildcard $(PPNEW)),)
-override FPC:=$(PPNEW)
 override FPC_VERSION:=$(shell $(PPNEW) -iV)
 override OS_TARGET:=$(shell $(PPNEW) -iTO)
 override CPU_TARGET:=$(shell $(PPNEW) -iTP)
@@ -478,7 +477,7 @@ ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),)
 
 .PHONY: rpmcopy rpm
 
-RPMFPCVERSION:=$(shell grep 'define fpcversion' $(CVSINSTALL)/fpc.spec | awk '{ print $$3 }')
+RPMFPCVERSION:=$(shell grep 'define fpcversion' $(CVSINSTALL)/fpc.spec | awk '{ print $$2 }')
 
 REDHATDIR=/usr/src/redhat
 RPMSOURCESDIR:=$(REDHATDIR)/SOURCES