* fixes to build correct again

This commit is contained in:
peter 1998-11-10 17:56:48 +00:00
parent c49f4590fd
commit c368ac358d
8 changed files with 49 additions and 18 deletions

View File

@ -45,7 +45,6 @@ ifndef GCCLIBPATH
GCCLIBPATH=/usr/lib/gcc-lib/i486-linux/2.7.2.3
endif
export RTLOPTS
#####################################################################
# Defaults
@ -78,6 +77,7 @@ endif
# to the RTL !!)
override RTLOPTS+=$(OPT)
#####################################################################
# Setup Targets
#####################################################################
@ -271,13 +271,10 @@ cvstest:
# Installation
#####################################################################
install:
installlib:
ifdef inlinux
umask 022
strip ppc386
$(MKDIR) $(LIBINSTALLDIR)
$(INSTALLEXE) ppc386 $(LIBINSTALLDIR)
ln -sf $(LIBINSTALLDIR)/ppc386 $(BININSTALLDIR)/ppc386
chmod 755 makecfg
makecfg $(LIBINSTALLDIR)/samplecfg $(UNITINSTALLDIR) $(MSGINSTALLDIR) $(GCCLIBPATH)
else
@ -287,6 +284,13 @@ endif
$(MKDIR) $(MSGINSTALLDIR)
$(INSTALL) errore.msg errorn.msg $(MSGINSTALLDIR)
# this also installs the link /usr/bin/ppc386. The .deb does that later
install: installlib
ifdef inlinux
$(MKDIR) $(BININSTALLDIR)
ln -sf $(LIBINSTALLDIR)/ppc386 $(BININSTALLDIR)/ppc386
endif
#####################################################################
# Misc
@ -333,7 +337,10 @@ $(M68KEXENAME): $(PASFILES) $(INCFILES)
#
# $Log$
# Revision 1.13 1998-10-22 23:55:24 peter
# Revision 1.14 1998-11-10 17:56:48 peter
# * fixes to build correct again
#
# Revision 1.13 1998/10/22 23:55:24 peter
# * dependencies,mkdep target is not linux only
#
# Revision 1.12 1998/10/22 19:15:46 peter

View File

@ -4,20 +4,20 @@
#############################################################################
all:
# make -C compiler cycle RELEASE=1
make -C compiler cycle RELEASE=1
make -C rtl/linux all RELEASE=1
make -C rtl/utils all RELEASE=1
# make -C docs html
install:
# make -C compiler install
make -C compiler installlib
make -C rtl/linux install
# make -C rtl/linux libinstall PPUMOVE=../utils/ppumove
make -C rtl/linux libinstall PPUMOVE=../utils/ppumove
make -C rtl/utils install
# make -C docs install
clean:
# make -C compiler clean
make -C compiler clean
make -C rtl/utils clean
# make -C rtl/linux libsclean
make -C rtl/linux libsclean
# make -C docs clean

10
install/debian/postinst Normal file
View File

@ -0,0 +1,10 @@
#! /bin/sh
# create link
ln -sf /usr/lib/fpc/0.99.9/ppc386 /usr/bin/ppc386
# create /etc/ppc386.cfg
/usr/lib/fpc/0.99.9/samplecfg `dirname \`find /usr/lib/gcc-lib/ -name libgcc.a -print | grep -v egcs \``
# update ld.so cache
ldconfig

View File

@ -9,7 +9,7 @@ build-stamp:
dh_testdir
# Add here commands to compile the package.
make
$(MAKE)
touch build-stamp
@ -19,7 +19,7 @@ clean:
rm -f build-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
-$(MAKE) clean
dh_clean

View File

@ -23,6 +23,9 @@ INC=
PROCINC=
OSINC=
# Needed options, without it won't compile
NEEDOPT=
# Add this dir also to the path as first
UNITDIR=
@ -49,7 +52,10 @@ include $(MAKEFILEFPC)
#
# $Log$
# Revision 1.1 1998-10-27 14:20:12 peter
# Revision 1.2 1998-11-10 17:56:51 peter
# * fixes to build correct again
#
# Revision 1.1 1998/10/27 14:20:12 peter
# + initial versions
#
#

View File

@ -18,6 +18,9 @@ OPT General commandline options you want to give
OPTDEF Commandline defines, which also need to be passed to
programs that don't want other options (like mkdep)
NEEDOPT Realy needed commandline options, also used when
RELEASE=1. Example: NEEDOPT=-Sg to allow goto
PP compiler to use, default is ppc386
Example to compile with version 0.99.8: PP=ppc998

View File

@ -376,7 +376,7 @@ endif
override PPOPTDEF=$(OPTDEF) -d$(CPU)
# Load commandline OPT and add target and unit dir to be sure
override PPOPT=$(OPT) -T$(OS_TARGET) -Fu$(UNITDIR)
override PPOPT=$(OPT) -T$(OS_TARGET) -Fu$(UNITDIR) $(NEEDOPT)
# Add include dirs INC and PROCINC
ifdef INC
@ -659,7 +659,10 @@ endif
#
# $Log$
# Revision 1.3 1998-11-10 15:06:25 peter
# Revision 1.4 1998-11-10 17:56:53 peter
# * fixes to build correct again
#
# Revision 1.3 1998/11/10 15:06:25 peter
# + PREFIXINSTALLDIR to allow /usr/local and pwd/debian/tmp
#
# Revision 1.2 1998/10/28 00:14:13 peter

View File

@ -314,7 +314,6 @@ staticlibinstall: staticlib
$(MKDIR) $(STATIC_LIBINSTALLDIR)
$(MKDIR) $(STATIC_UNITINSTALLDIR)
$(INSTALLEXE) libfpc$(STATICLIBEXT) $(STATIC_LIBINSTALLDIR)
$(INSTALLEXE) libobjpas$(STATICLIBEXT) $(STATIC_LIBINSTALLDIR)
$(INSTALL) *$(PPUEXT) $(OBJLOADERS) $(STATIC_UNITINSTALLDIR)
sharedlibinstall: sharedlib
@ -337,7 +336,10 @@ include $(CFG)/makefile.def
#
# $Log$
# Revision 1.7 1998-10-11 13:47:21 michael
# Revision 1.8 1998-11-10 17:56:56 peter
# * fixes to build correct again
#
# Revision 1.7 1998/10/11 13:47:21 michael
# sysutils disk.inc
#
# Revision 1.6 1998/10/11 12:21:49 michael