* short commandline

This commit is contained in:
peter 2001-09-17 21:26:12 +00:00
parent 6208f2e4bc
commit e71bc5c6c3
2 changed files with 6 additions and 6 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2001/09/13]
# Don't edit, this file is generated by FPCMake Version 1.1 [2001/09/17]
#
default: all
override PATH:=$(subst \,/,$(PATH))
@ -178,11 +178,9 @@ endif
endif
ifeq ($(GDB),1)
override LIBDIR+=$(GDBLIBDIR)
override OBJDIR+=$(GDBOBJDIR)
else
override UNITDIR+=fakegdb
endif
override UNITDIR+=$(PACKAGESDIR)/regexpr
override TARGET_DIRS+=compiler fakegdb
override TARGET_PROGRAMS+=fp
override INSTALL_DATADIR=$(INSTALL_BASEDIR)/ide
@ -596,9 +594,14 @@ ifdef inUnix
ifndef GCCLIBDIR
GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
endif
ifeq ($(OS_TARGET),linux)
ifndef OTHERLIBDIR
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
endif
endif
ifeq ($(OS_TARGET),netbsd)
OTHERLIBDIR+=/usr/pkg/lib
endif
export GCCLIBDIR OTHERLIB
endif
ifeq ($(OS_TARGET),linux)

View File

@ -96,13 +96,10 @@ endif
ifeq ($(GDB),1)
# The gdbint is already included due the gdbint package dependency
override LIBDIR+=$(GDBLIBDIR)
override OBJDIR+=$(GDBOBJDIR)
else
override UNITDIR+=fakegdb
endif
override UNITDIR+=$(PACKAGESDIR)/regexpr
[rules]
.PHONY: compilerunits compilerclean \
nogdb gdb all \