Browse Source

* regenerated

carl 24 years ago
parent
commit
11772eaf1c
1 changed files with 22 additions and 16 deletions
  1. 22 16
      packages/Makefile

+ 22 - 16
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/09/20]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/09/23]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -67,33 +67,28 @@ endif
 ifndef FPC
 ifdef PP
 FPC=$(PP)
-else
-ifdef inUnix
-CPU_SOURCE=$(shell uname -m)
-ifeq (m68k,$(CPU_SOURCE))
-FPC=ppc68k
-else
-FPC=ppc386
 endif
-else
-FPC=ppc386
 endif
+ifndef FPC
+FPC:=$(shell fpc -P?)
+ifneq ($(findstring Error,$(PPCBIN)),)
+override FPC=ppc386
 endif
 endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
-ifndef OS_TARGET
-OS_TARGET:=$(shell $(FPC) -iTO)
-endif
-ifndef OS_SOURCE
-OS_SOURCE:=$(shell $(FPC) -iSO)
-endif
 ifndef CPU_TARGET
 CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 ifndef CPU_SOURCE
 CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
+ifndef OS_TARGET
+OS_TARGET:=$(shell $(FPC) -iTO)
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(shell $(FPC) -iSO)
+endif
 ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
@@ -148,6 +143,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 override TARGET_DIRS+=zlib ncurses x11 gtk syslog inet uncgi mysql ibase postgres oracle opengl forms svgalib ggi libpng libgd utmp paszlib gdbint cmem regexpr unzip
 endif
+ifeq ($(OS_TARGET),beos)
+override TARGET_DIRS+=uncgi paszlib unzip regexpr
+endif
 ifeq ($(OS_TARGET),netbsd)
 override TARGET_DIRS+=zlib ncurses x11 gtk syslog inet uncgi mysql ibase postgres oracle opengl forms svgalib ggi libpng libgd utmp paszlib gdbint cmem regexpr unzip
 endif
@@ -554,7 +552,9 @@ endif
 ifndef INSTALL_DATADIR
 INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
+ifndef NOCPUDEF
 override FPCOPTDEF=$(CPU_TARGET)
+endif
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
 endif
@@ -858,6 +858,12 @@ TARGET_DIRS_CMEM=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_UNZIP=1
 endif
+ifeq ($(OS_TARGET),beos)
+TARGET_DIRS_UNCGI=1
+TARGET_DIRS_PASZLIB=1
+TARGET_DIRS_UNZIP=1
+TARGET_DIRS_REGEXPR=1
+endif
 ifeq ($(OS_TARGET),netbsd)
 TARGET_DIRS_ZLIB=1
 TARGET_DIRS_NCURSES=1