* merged 1.0.1 install

This commit is contained in:
peter 2000-09-09 21:16:44 +00:00
parent a7f67c9b9c
commit 163bdc5f22
5 changed files with 26 additions and 18 deletions

View File

@ -479,7 +479,7 @@ rpmcopy: distclean
install -d $(RPMSOURCESDIR) install -d $(RPMSOURCESDIR)
# fpc.rpm # fpc.rpm
rm -rf $(RPMSRCDIR) rm -rf $(RPMSRCDIR)
cp $(CVSINSTALL)/fpc-$(FPC_VERSION).spec $(RPMSPECDIR) cp $(CVSINSTALL)/fpc.spec $(RPMSPECDIR)/fpc-$(FPC_VERSION).spec
install -d $(RPMSRCDIR) install -d $(RPMSRCDIR)
$(COPYTREE) compiler $(RPMSRCDIR) $(COPYTREE) compiler $(RPMSRCDIR)
$(COPYTREE) rtl $(RPMSRCDIR) $(COPYTREE) rtl $(RPMSRCDIR)
@ -496,7 +496,7 @@ rpmcopy: distclean
cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(FPC_VERSION)-src.tar.gz cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(FPC_VERSION)-src.tar.gz
# fpc-docs.rpm # fpc-docs.rpm
rm -rf $(DOCSRCDIR) rm -rf $(DOCSRCDIR)
cp $(CVSINSTALL)/fpc-docs-$(FPC_VERSION).spec $(RPMSPECDIR) cp $(CVSINSTALL)/fpc-docs.spec $(RPMSPECDIR)/fpc-docs-$(FPC_VERSION).spec
install -d $(DOCSRCDIR) install -d $(DOCSRCDIR)
$(COPYTREE) docs $(DOCSRCDIR) $(COPYTREE) docs $(DOCSRCDIR)
find $(DOCSRCDIR) -name 'CVS*' | xargs -n1 rm -rf find $(DOCSRCDIR) -name 'CVS*' | xargs -n1 rm -rf

View File

@ -24,8 +24,8 @@
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.ppu /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.ppu
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.ppu /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrc.ppu
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crcasm.ppu /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrcasm.ppu
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.ppu /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.ppu
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.ppu /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.ppu
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.ppu /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.ppu
@ -69,10 +69,10 @@
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzio.a /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzio.a
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libcrcasm.a /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzcrcasm.a
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crcasm.o /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrcasm.o
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libcrc.a /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzcrc.a
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.o /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrc.o
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libadler.a /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libadler.a
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o
/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libpaszlib.a /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libpaszlib.a

View File

@ -198,7 +198,7 @@ binary-arch: build-arch arrange-arch debian-files
dh_installchangelogs -a dh_installchangelogs -a
dh_installchangelogs -pfp-compiler logs/Changes.compiler dh_installchangelogs -pfp-compiler logs/Changes.compiler
dh_installchangelogs -pfp-rtl logs/Changes.rtl dh_installchangelogs -pfp-units-rtl logs/Changes.rtl
dh_installchangelogs -pfp-utils logs/Changes.utils dh_installchangelogs -pfp-utils logs/Changes.utils
dh_installchangelogs -pfp-units-fcl logs/Changes.fcl dh_installchangelogs -pfp-units-fcl logs/Changes.fcl
dh_installchangelogs -pfp-units-api logs/Changes.api dh_installchangelogs -pfp-units-api logs/Changes.api

View File

@ -1,18 +1,20 @@
Name: fpc-docs Name: fpc-docs
Version: 1.0.1 Version: 1.0.1
Release: 1 Release: 1
ExclusiveArch: i386
Copyright: GPL Copyright: GPL
Group: Development/Languages Group: Development/Languages
Source: fpc-docs-1.0.1-src.tar.gz Source: fpc-docs-1.0.1-src.tar.gz
Summary: Free Pascal Compiler Documentation Summary: Free Pascal Compiler Documentation
Packager: Peter Vreman (peter@freepascal.org) Packager: Peter Vreman (peter@freepascal.org)
URL: http://www.freepascal.org/ URL: http://www.freepascal.org/
BuildRoot: /tmp/fpc-docs-build
%define fpcversion 1.0.1 %define fpcversion 1.0.1
%define fpcdir /usr/lib/fpc/%{fpcversion} %define fpcdir /usr/lib/fpc/%{fpcversion}
%define docdir /usr/doc/fpc-%{fpcversion} %define docdir /usr/doc/fpc-%{fpcversion}
%define builddocdir %{buildroot}%{docdir}
%description %description
The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
Pascal Compiler. It comes with fully TP 7.0 compatible run-time library. Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
@ -28,7 +30,7 @@ This package contains the documentation in PDF format
make -C docs pdf make -C docs pdf
%install %install
make -C docs pdfinstall DOCINSTALLDIR=%{docdir} make -C docs pdfinstall DOCINSTALLDIR=%{builddocdir}
%clean %clean
make -C docs clean make -C docs clean

View File

@ -1,18 +1,22 @@
Name: fpc Name: fpc
Version: 1.0.1 Version: 1.0.1
Release: 1 Release: 1
ExclusiveArch: i386 ExclusiveArch: i386 i586 i686
Copyright: GPL Copyright: GPL
Group: Development/Languages Group: Development/Languages
Source: fpc-1.0.1-src.tar.gz Source: fpc-1.0.1-src.tar.gz
Summary: Free Pascal Compiler Summary: Free Pascal Compiler
Packager: Peter Vreman (peter@freepascal.org) Packager: Peter Vreman (peter@freepascal.org)
URL: http://www.freepascal.org/ URL: http://www.freepascal.org/
BuildRoot: /tmp/fpc-build
BuildRequires: fpc
%define fpcversion 1.0.1 %define fpcversion 1.0.1
%define fpcdir /usr/lib/fpc/%{fpcversion} %define fpcdir /usr/lib/fpc/%{fpcversion}
%define docdir /usr/doc/fpc-%{fpcversion} %define docdir /usr/doc/fpc-%{fpcversion}
%define builddocdir %{buildroot}%{docdir}
%description %description
The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
Pascal Compiler. It comes with fully TP 7.0 compatible run-time library. Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
@ -37,7 +41,7 @@ NEWPP=`pwd`/compiler/ppc386
%install %install
NEWPP=`pwd`/compiler/ppc386 NEWPP=`pwd`/compiler/ppc386
NEWPPUFILES=`pwd`/utils/ppufiles NEWPPUFILES=`pwd`/utils/ppufiles
INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr" INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=%{buildroot}/usr"
make compiler_install ${INSTALLOPTS} make compiler_install ${INSTALLOPTS}
make rtl_install ${INSTALLOPTS} make rtl_install ${INSTALLOPTS}
make fcl_install ${INSTALLOPTS} make fcl_install ${INSTALLOPTS}
@ -45,12 +49,12 @@ INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr"
make packages_install ${INSTALLOPTS} make packages_install ${INSTALLOPTS}
make utils_install ${INSTALLOPTS} make utils_install ${INSTALLOPTS}
make fcl_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{docdir} make fcl_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
make api_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{docdir} make api_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
make packages_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{docdir} make packages_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
make demo_install ${INSTALLOPTS} DOCINSTALLDIR=%{docdir} make demo_install ${INSTALLOPTS} SOURCEINSTALLDIR=%{builddocdir}
make doc_install ${INSTALLOPTS} DOCINSTALLDIR=%{docdir} make doc_install ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
make man_install ${INSTALLOPTS} make man_install ${INSTALLOPTS}
%clean %clean
@ -61,6 +65,8 @@ INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr"
make packages_clean make packages_clean
make utils_clean make utils_clean
rm -rf %{buildroot}
%post %post
FPCDIR=%{fpcdir} FPCDIR=%{fpcdir}