* new locations for cross-compiler binaries

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/13]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/17]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -403,9 +403,17 @@ endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
+else
 INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
+endif
+else
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
 else
 INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+endif
 ifdef INSTALL_FPCPACKAGE
 INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
 endif
@@ -912,11 +920,11 @@ ASNAME=$(BINUTILSPREFIX)as
 LDNAME=$(BINUTILSPREFIX)ld
 ARNAME=$(BINUTILSPREFIX)ar
 RCNAME=$(BINUTILSPREFIX)rc
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),win32)
-ASNAME=asw
-LDNAME=ldw
-ARNAME=arw
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
 endif
 endif
 ifndef ASPROG
@@ -1830,17 +1838,33 @@ htmldocs:
 .PHONY: quickinstall install installsym
 MSGINSTALLDIR=$(INSTALL_BASEDIR)/msg
 override PPEXEFILE:=$(wildcard $(EXENAME))
+ifdef UNIXINSTALLDIR
+ifdef CROSSCOMPILE
+PPCCPULOCATION= $(INSTALL_BINDIR)
+PPCCROSSLOCATION=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)
+else
+PPCCPULOCATION= $(INSTALL_BASEDIR)
+endif
+else
+ifdef CROSSCOMPILE
+PPCCPULOCATION= $(INSTALL_BINDIR)
+PPCCROSSLOCATION=$(INSTALL_BINDIR)/cross/$(FULL_TARGET)
+else
+PPCCPULOCATION=  $(INSTALL_BINDIR)
+endif
+endif
 quickinstall: $(addsuffix _install,$(TARGET_DIRS))
 ifneq ($(PPEXEFILE),)
 ifdef UPXPROG
 	-$(UPXPROG) $(EXENAME)
 endif
-ifdef UNIXINSTALLDIR
-	$(MKDIR) $(INSTALL_BASEDIR)
-	$(INSTALLEXE) $(EXENAME) $(INSTALL_BASEDIR)
-else
-	$(MKDIR) $(INSTALL_BINDIR)
-	$(INSTALLEXE) $(EXENAME) $(INSTALL_BINDIR)
+	$(MKDIR) $(PPCCPULOCATION)
+	$(INSTALLEXE) $(EXENAME) $(PPCCPULOCATION)
+ifdef CROSSCOMPILE
+	$(MKDIR) $(PPCCROSSLOCATION)
+	$(ECHO) $(PPCROSSNAME)
+	$(ECHO $(PPCCROSSLOCATION)
+	$(INSTALLEXE) $(PPCROSSNAME) $(PPCCROSSLOCATION)
 endif
 endif
 install: quickinstall

compiler/Makefile.fpc

@@ -516,6 +516,22 @@ htmldocs:
 MSGINSTALLDIR=$(INSTALL_BASEDIR)/msg
 override PPEXEFILE:=$(wildcard $(EXENAME))
 
+ifdef UNIXINSTALLDIR
+ifdef CROSSCOMPILE
+PPCCPULOCATION= $(INSTALL_BINDIR)
+PPCCROSSLOCATION=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)
+else
+PPCCPULOCATION= $(INSTALL_BASEDIR)
+endif
+else
+ifdef CROSSCOMPILE
+PPCCPULOCATION= $(INSTALL_BINDIR)
+PPCCROSSLOCATION=$(INSTALL_BINDIR)/cross/$(FULL_TARGET)
+else
+PPCCPULOCATION=  $(INSTALL_BINDIR)
+endif
+endif
+
 # This will only install the ppc386.exe, not the message files etc.
 quickinstall: $(addsuffix _install,$(TARGET_DIRS))
 # Install ppc386.exe
@@ -523,12 +539,13 @@ ifneq ($(PPEXEFILE),)
 ifdef UPXPROG
         -$(UPXPROG) $(EXENAME)
 endif
-ifdef UNIXINSTALLDIR
-        $(MKDIR) $(INSTALL_BASEDIR)
-        $(INSTALLEXE) $(EXENAME) $(INSTALL_BASEDIR)
-else
-        $(MKDIR) $(INSTALL_BINDIR)
-        $(INSTALLEXE) $(EXENAME) $(INSTALL_BINDIR)
+        $(MKDIR) $(PPCCPULOCATION)
+        $(INSTALLEXE) $(EXENAME) $(PPCCPULOCATION)
+ifdef CROSSCOMPILE
+	$(MKDIR) $(PPCCROSSLOCATION)
+	$(ECHO) $(PPCROSSNAME)
+	$(ECHO $(PPCCROSSLOCATION)
+	$(INSTALLEXE) $(PPCROSSNAME) $(PPCCROSSLOCATION)
 endif
 endif