paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 07:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 79 via svnmerge from

Browse Source 
/trunk

git-svn-id: branches/fixes_2_0@80 -
This commit is contained in:
peter 2005-05-23 20:53:50 +00:00
parent 9fad75e59c
commit 8b2d841c05
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -2605,6 +2605,11 @@ RPMDIR=$(BUILDDIR)/rpm
RPMSPECFILE:=$(RPMDIR)/SPECS/fpc-$(PACKAGE_VERSION).spec
RPMSOURCEFILE:=$(RPMDIR)/SOURCES/fpc-$(PACKAGE_VERSION)-src.tar.gz
RPMSRCDIR:=$(RPMDIR)/SOURCES/fpc
RPMDEFINES=--define "_topdir $(RPMDIR)" \
--define "_sourcedir $(RPMDIR)/SOURCES" \
--define "_builddir $(RPMDIR)/BUILD" \
--define "_rpmdir $(RPMDIR)/RPMS" \
--define "_srcrpmdir $(RPMDIR)/SRPMS"
rpmcopy: distclean
false || [ -d $(RPMDIR) ] || install -d $(RPMDIR)
false || [ -d $(RPMDIR)/BUILD ] || install -d $(RPMDIR)/BUILD
@ -2613,12 +2618,7 @@ rpmcopy: distclean
false || [ -d $(RPMDIR)/RPMS ] || install -d $(RPMDIR)/RPMS
false || [ -d $(RPMDIR)/SRPMS ] || install -d $(RPMDIR)/SRPMS
rm -rf $(RPMSRCDIR)
echo "%define _topdir $(RPMDIR)" > $(RPMSPECFILE)
echo "%define _sourcedir $(RPMDIR)/SOURCES" >> $(RPMSPECFILE)
echo "%define _builddir $(RPMDIR)/BUILD" >> $(RPMSPECFILE)
echo "%define _rpmdir $(RPMDIR)/RPMS" >> $(RPMSPECFILE)
echo "%define _srcrpmdir $(RPMDIR)/SRPMS" >> $(RPMSPECFILE)
sed "s+%FPCVERSION%+$(PACKAGE_VERSION)+" $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
sed "s+%FPCVERSION%+$(PACKAGE_VERSION)+" $(CVSINSTALL)/fpc.spec > $(RPMSPECFILE)
ifndef NODOCS
cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE)
endif
@ -2631,7 +2631,6 @@ endif
$(COPYTREE) packages $(RPMSRCDIR)
$(COPYTREE) utils $(RPMSRCDIR)
$(COPYTREE) demo $(RPMSRCDIR)
$(COPYTREE) logs $(RPMSRCDIR)
$(COPYTREE) Makefile* $(RPMSRCDIR)
$(COPYTREE) $(CVSINSTALL)/man $(RPMSRCDIR)
$(COPYTREE) $(CVSINSTALL)/doc $(RPMSRCDIR)
@ -2644,7 +2643,7 @@ endif
cd $(RPMSRCDIR) ; tar cfvz $(RPMSOURCEFILE) *
rm -rf $(RPMSRCDIR)
rpmbuild: checkfpcdir
$(RPMBUILD) --nodeps -ba $(RPMSPECFILE)
$(RPMBUILD) $(RPMDEFINES) --nodeps -ba $(RPMSPECFILE)
mv `find $(RPMDIR)/RPMS/ -name '*.rpm'` .
mv `find $(RPMDIR)/SRPMS/ -name '*.rpm'` .
rpmclean:

17
Makefile.fpc
View File

@ -608,6 +608,11 @@ RPMDIR=$(BUILDDIR)/rpm
RPMSPECFILE:=$(RPMDIR)/SPECS/fpc-$(PACKAGE_VERSION).spec
RPMSOURCEFILE:=$(RPMDIR)/SOURCES/fpc-$(PACKAGE_VERSION)-src.tar.gz
RPMSRCDIR:=$(RPMDIR)/SOURCES/fpc
RPMDEFINES=--define "_topdir $(RPMDIR)" \
--define "_sourcedir $(RPMDIR)/SOURCES" \
--define "_builddir $(RPMDIR)/BUILD" \
--define "_rpmdir $(RPMDIR)/RPMS" \
--define "_srcrpmdir $(RPMDIR)/SRPMS"
rpmcopy: distclean
# false || is needed to workaround fpcmake sections
false || [ -d $(RPMDIR) ] || install -d $(RPMDIR)
@ -617,13 +622,7 @@ rpmcopy: distclean
false || [ -d $(RPMDIR)/RPMS ] || install -d $(RPMDIR)/RPMS
false || [ -d $(RPMDIR)/SRPMS ] || install -d $(RPMDIR)/SRPMS
rm -rf $(RPMSRCDIR)
# Create fpc.spec, include our own builddir
echo "%define _topdir $(RPMDIR)" > $(RPMSPECFILE)
echo "%define _sourcedir $(RPMDIR)/SOURCES" >> $(RPMSPECFILE)
echo "%define _builddir $(RPMDIR)/BUILD" >> $(RPMSPECFILE)
echo "%define _rpmdir $(RPMDIR)/RPMS" >> $(RPMSPECFILE)
echo "%define _srcrpmdir $(RPMDIR)/SRPMS" >> $(RPMSPECFILE)
sed "s+%FPCVERSION%+$(PACKAGE_VERSION)+" $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
sed "s+%FPCVERSION%+$(PACKAGE_VERSION)+" $(CVSINSTALL)/fpc.spec > $(RPMSPECFILE)
ifndef NODOCS
cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE)
endif
@ -637,7 +636,7 @@ endif
$(COPYTREE) packages $(RPMSRCDIR)
$(COPYTREE) utils $(RPMSRCDIR)
$(COPYTREE) demo $(RPMSRCDIR)
$(COPYTREE) logs $(RPMSRCDIR)
# $(COPYTREE) logs $(RPMSRCDIR)
$(COPYTREE) Makefile* $(RPMSRCDIR)
$(COPYTREE) $(CVSINSTALL)/man $(RPMSRCDIR)
$(COPYTREE) $(CVSINSTALL)/doc $(RPMSRCDIR)
@ -651,7 +650,7 @@ endif
rm -rf $(RPMSRCDIR)
rpmbuild: checkfpcdir
$(RPMBUILD) --nodeps -ba $(RPMSPECFILE)
$(RPMBUILD) $(RPMDEFINES) --nodeps -ba $(RPMSPECFILE)
mv `find $(RPMDIR)/RPMS/ -name '*.rpm'` .
mv `find $(RPMDIR)/SRPMS/ -name '*.rpm'` .