From 24e6d97e5f5d768921c5d58b829fb8d29b38d75e Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 23 Jan 2000 20:15:16 +0000 Subject: [PATCH] * rpm/deb target in install dir * install also faq,readme,news for rpm/deb --- base/Makefile | 3 ++ base/Makefile.fpc | 3 ++ docs/Makefile | 8 +++- install/Makefile | 62 +++++++++++++++++++++++++++++ install/Makefile.fpc | 59 +++++++++++++++++++++++++++ install/debian/fp-compiler.files.in | 4 ++ install/debian/rules | 1 + install/fpc-0.99.14.spec | 5 +++ 8 files changed, 143 insertions(+), 2 deletions(-) diff --git a/base/Makefile b/base/Makefile index 65235d3ee1..92c7f8d9ff 100644 --- a/base/Makefile +++ b/base/Makefile @@ -1083,6 +1083,9 @@ demo_install: man_install: $(MAKE) -C man installman +doc_install: + $(MAKE) -C doc installdoc + ####################################### # Packaging targets diff --git a/base/Makefile.fpc b/base/Makefile.fpc index 2ed4990aa0..c905a2b525 100644 --- a/base/Makefile.fpc +++ b/base/Makefile.fpc @@ -78,6 +78,9 @@ demo_install: man_install: $(MAKE) -C man installman +doc_install: + $(MAKE) -C doc installdoc + ####################################### # Packaging targets diff --git a/docs/Makefile b/docs/Makefile index 16d02a14e9..835ee1e740 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -30,7 +30,7 @@ PREFIXINSTALLDIR=/usr endif ifndef DOCINSTALLDIR -DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(shell ppc386 -iV) +DOCINSTALLDIR:=$(PREFIXINSTALLDIR)/doc/fpc-$(shell ppc386 -iV) endif # @@ -441,7 +441,11 @@ linuxexamples: examples # # $Log$ -# Revision 1.32 2000-01-14 12:16:40 peter +# Revision 1.33 2000-01-23 20:15:16 peter +# * rpm/deb target in install dir +# * install also faq,readme,news for rpm/deb +# +# Revision 1.32 2000/01/14 12:16:40 peter # * package generation fixes # # Revision 1.31 2000/01/11 09:55:36 peter diff --git a/install/Makefile b/install/Makefile index 32d363481f..eb550ab246 100644 --- a/install/Makefile +++ b/install/Makefile @@ -1150,3 +1150,65 @@ win32: linux: $(MAKE) install OS_TARGET=linux + + +########################################################################## +# Debian / RPM +########################################################################## + +.PHONY: debian + + +DEBSRCDIR:=/usr/src/fpc-$(FPC_VERSION) +deb: + rm -rf $(DEBSRCDIR) + install -d $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/compiler $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/rtl $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/fcl $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/api $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/packages $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/utils $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/logs $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/docs $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/base/Makefile* $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/install/debian $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/install/man $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/install/doc $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/install/demo $(DEBSRCDIR) + find $(DEBSRCDIR) -name 'CVS*' | xargs -n1 rm -rf + chmod 755 $(DEBSRCDIR)/debian/rules + cd $(DEBSRCDIR) ; debian/rules binary + + +RPMSOURCESDIR:=/usr/src/redhat/SOURCES +RPMSPECDIR:=/usr/src/redhat/SPECS +RPMSRCDIR:=$(RPMSOURCESDIR)/fpc +DOCSRCDIR:=$(RPMSOURCESDIR)/fpcdoc +rpm: +# fpc.rpm + rm -rf $(RPMSRCDIR) + cp fpc-$(FPC_VERSION).spec $(RPMSPECDIR) + install -d $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/compiler $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/rtl $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/fcl $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/api $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/packages $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/utils $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/logs $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/base/Makefile* $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/install/man $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/install/doc $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/install/demo $(RPMSRCDIR) + find $(RPMSRCDIR) -name 'CVS*' | xargs -n1 rm -rf + cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(FPC_VERSION)-src.tar.gz + cd $(RPMSPECDIR) ; rpm -ba fpc-$(FPC_VERSION).spec +# fpc-docs.rpm + rm -rf $(DOCSRCDIR) + cp fpc-docs-$(FPC_VERSION).spec $(RPMSPECDIR) + install -d $(DOCSRCDIR) + $(COPYTREE) $(CVSBASE)/docs $(DOCSRCDIR) + find $(DOCSRCDIR) -name 'CVS*' | xargs -n1 rm -rf + cd $(DOCSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-docs-$(FPC_VERSION)-src.tar.gz + cd $(RPMSPECDIR) ; rpm -ba fpc-docs-$(FPC_VERSION).spec diff --git a/install/Makefile.fpc b/install/Makefile.fpc index 8ec1a2384d..c53d1b2c01 100644 --- a/install/Makefile.fpc +++ b/install/Makefile.fpc @@ -243,4 +243,63 @@ linux: $(MAKE) install OS_TARGET=linux +########################################################################## +# Debian / RPM +########################################################################## +.PHONY: debian + + +DEBSRCDIR:=/usr/src/fpc-$(FPC_VERSION) +deb: + rm -rf $(DEBSRCDIR) + install -d $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/compiler $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/rtl $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/fcl $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/api $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/packages $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/utils $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/logs $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/docs $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/base/Makefile* $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/install/debian $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/install/man $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/install/doc $(DEBSRCDIR) + $(COPYTREE) $(CVSBASE)/install/demo $(DEBSRCDIR) + find $(DEBSRCDIR) -name 'CVS*' | xargs -n1 rm -rf + chmod 755 $(DEBSRCDIR)/debian/rules + cd $(DEBSRCDIR) ; debian/rules binary + + +RPMSOURCESDIR:=/usr/src/redhat/SOURCES +RPMSPECDIR:=/usr/src/redhat/SPECS +RPMSRCDIR:=$(RPMSOURCESDIR)/fpc +DOCSRCDIR:=$(RPMSOURCESDIR)/fpcdoc +rpm: +# fpc.rpm + rm -rf $(RPMSRCDIR) + cp fpc-$(FPC_VERSION).spec $(RPMSPECDIR) + install -d $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/compiler $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/rtl $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/fcl $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/api $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/packages $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/utils $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/logs $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/base/Makefile* $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/install/man $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/install/doc $(RPMSRCDIR) + $(COPYTREE) $(CVSBASE)/install/demo $(RPMSRCDIR) + find $(RPMSRCDIR) -name 'CVS*' | xargs -n1 rm -rf + cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(FPC_VERSION)-src.tar.gz + cd $(RPMSPECDIR) ; rpm -ba fpc-$(FPC_VERSION).spec +# fpc-docs.rpm + rm -rf $(DOCSRCDIR) + cp fpc-docs-$(FPC_VERSION).spec $(RPMSPECDIR) + install -d $(DOCSRCDIR) + $(COPYTREE) $(CVSBASE)/docs $(DOCSRCDIR) + find $(DOCSRCDIR) -name 'CVS*' | xargs -n1 rm -rf + cd $(DOCSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-docs-$(FPC_VERSION)-src.tar.gz + cd $(RPMSPECDIR) ; rpm -ba fpc-docs-$(FPC_VERSION).spec diff --git a/install/debian/fp-compiler.files.in b/install/debian/fp-compiler.files.in index ffe881c936..97a4a1e247 100644 --- a/install/debian/fp-compiler.files.in +++ b/install/debian/fp-compiler.files.in @@ -2,6 +2,10 @@ /usr/lib/fpc/%{fpcversion}/samplecfg /usr/lib/fpc/%{fpcversion}/msg /usr/share/doc/fp-compiler/examples +/usr/share/doc/fp-compiler/NEWS +/usr/share/doc/fp-compiler/README +/usr/share/doc/fp-compiler/faq.html +/usr/share/doc/fp-compiler/faq.txt /usr/share/man/man1/ppc386.1 /usr/share/man/man5/ppc386.cfg.5 diff --git a/install/debian/rules b/install/debian/rules index 341205b975..5139992210 100644 --- a/install/debian/rules +++ b/install/debian/rules @@ -101,6 +101,7 @@ install-arch-stamp: build-arch-stamp debian-files-stamp $(MAKE) man_install $(INSTALLOPTS) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr/share $(MAKE) demo_install $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-compiler + $(MAKE) doc_install $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-compiler $(MAKE) -C packages/gtk installexamples $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-units-gtk touch install-arch-stamp diff --git a/install/fpc-0.99.14.spec b/install/fpc-0.99.14.spec index ec51fa079a..391130887e 100644 --- a/install/fpc-0.99.14.spec +++ b/install/fpc-0.99.14.spec @@ -47,6 +47,7 @@ NEWPPUFILES=`pwd`/utils/ppufiles make utils_install PP=${NEWPP} PPUFILES=${NEWPPUFILES} make demo_install PP=${NEWPP} DOCINSTALLDIR=%{docdir} + make doc_install PP=${NEWPP} DOCINSTALLDIR=%{docdir} make man_install PP=${NEWPP} %clean @@ -102,3 +103,7 @@ ldconfig /usr/man/man5/fpcmake.5 /usr/man/man5/ptop.cfg.5 %{docdir}/examples +%{docdir}/README +%{docdir}/NEWS +%{docdir}/faq.html +%{docdir}/faq.txt