paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-04 23:11:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Patch from Colin Western to fix RPM build with overrides

Browse Source
This commit is contained in:
michael 2005-01-22 21:04:17 +00:00
parent ac5c742443
commit 5268856a96
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/11] # Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/12]
# #
default: help default: help
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
@ -2614,6 +2614,10 @@ rpmcopy: distclean
false || [ -d $(RPMDIR)/SRPMS ] || install -d $(RPMDIR)/SRPMS false || [ -d $(RPMDIR)/SRPMS ] || install -d $(RPMDIR)/SRPMS
rm -rf $(RPMSRCDIR) rm -rf $(RPMSRCDIR)
echo "%define _topdir $(RPMDIR)" > $(RPMSPECFILE) 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)
cat $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE) cat $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
ifndef NODOCS ifndef NODOCS
cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE) cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE)

4
Makefile.fpc
View File

@ -623,6 +623,10 @@ rpmcopy: distclean
rm -rf $(RPMSRCDIR) rm -rf $(RPMSRCDIR)
# Create fpc.spec, include our own builddir # Create fpc.spec, include our own builddir
echo "%define _topdir $(RPMDIR)" > $(RPMSPECFILE) 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)
cat $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE) cat $(CVSINSTALL)/fpc.spec >> $(RPMSPECFILE)
ifndef NODOCS ifndef NODOCS
cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE) cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECFILE)