|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/09]
|
|
|
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/26]
|
|
|
#
|
|
|
default: help
|
|
|
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
|
|
|
@@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
|
|
|
else
|
|
|
SEARCHPATH:=$(subst ;, ,$(PATH))
|
|
|
endif
|
|
|
+SEARCHPATH+=$(patsubst %/,%,$(dir $(MAKE)))
|
|
|
PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
|
|
|
ifeq ($(PWD),)
|
|
|
PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
|
|
|
@@ -419,9 +420,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
|
|
|
@@ -555,8 +564,11 @@ ZIPSUFFIX=go32
|
|
|
endif
|
|
|
ifeq ($(OS_TARGET),watcom)
|
|
|
STATICLIBPREFIX=
|
|
|
-FPCMADE=fpcmade.dos
|
|
|
-ZIPSUFFIX=watcom
|
|
|
+FPCMADE=fpcmade.wat
|
|
|
+ZIPSUFFIX=watc
|
|
|
+OEXT=.obj
|
|
|
+ASMEXT=.asm
|
|
|
+SHAREDLIBEXT=.dll
|
|
|
endif
|
|
|
ifeq ($(OS_TARGET),linux)
|
|
|
EXEEXT=
|
|
|
@@ -928,11 +940,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
|
|
|
@@ -2169,6 +2181,7 @@ renametoshort:
|
|
|
-mv upaszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIX).zip
|
|
|
-mv uuncgi$(ZIPSUFFIX).zip ucgi$(ZIPSUFFIX).zip
|
|
|
-mv uunzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIX).zip
|
|
|
+ -mv unetdb$(ZIPSUFFIX).zip undb$(ZIPSUFFIX).zip
|
|
|
-mv uftpapi$(ZIPSUFFIX).zip uftp$(ZIPSUFFIX).zip
|
|
|
-mv uhwvideo$(ZIPSUFFIX).zip uhwv$(ZIPSUFFIX).zip
|
|
|
shortsrc:
|
peter