paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-13 01:29:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

* redhat dir fix

Browse Source
This commit is contained in:
peter 2003-11-29 13:58:31 +00:00
parent 64d6f24300
commit b767dd8ca3
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -2232,16 +2232,16 @@ ifeq ($(RPMBUILD),)
RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH))))
endif
REDHATDIR=/usr/src/redhat
ifeq ($(wildcard REDHATDIR),)
ifeq ($(wildcard $(REDHATDIR)),)
REDHATDIR=/usr/src/rpm
endif
RPMSOURCESDIR:=$(REDHATDIR)/SOURCES
RPMSPECDIR:=$(REDHATDIR)/SPECS
RPMSRCDIR:=$(RPMSOURCESDIR)/fpc
rpmcopy: distclean
install -d $(REDHATDIR)
install -d $(RPMSPECDIR)
install -d $(RPMSOURCESDIR)
false || [ -d $(REDHATDIR) ] || install -d $(REDHATDIR)
false || [ -d $(RRPMSPECDIR) ] || install -d $(RPMSPECDIR)
false || [ -d $(RPMSOURCESDIR) ] || install -d $(RPMSOURCESDIR)
rm -rf $(RPMSRCDIR)
cp $(CVSINSTALL)/fpc.spec $(RPMSPECDIR)/fpc-$(RPMFPCVERSION).spec
ifndef NODOCS
@ -2265,6 +2265,7 @@ ifndef NODOCS
endif
find $(RPMSRCDIR) -name 'CVS*' | xargs -n1 rm -rf
cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(RPMFPCVERSION)-src.tar.gz
rm -rf $(RPMSRCDIR)
rpm: checkfpcdir rpmcopy
cd $(RPMSPECDIR) ; $(RPMBUILD) --nodeps -ba fpc-$(RPMFPCVERSION).spec
endif # spec found

11
Makefile.fpc
View File

@ -598,17 +598,17 @@ RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH))))
endif
REDHATDIR=/usr/src/redhat
# Debian has /usr/src/rpm
ifeq ($(wildcard REDHATDIR),)
ifeq ($(wildcard $(REDHATDIR)),)
REDHATDIR=/usr/src/rpm
endif
RPMSOURCESDIR:=$(REDHATDIR)/SOURCES
RPMSPECDIR:=$(REDHATDIR)/SPECS
RPMSRCDIR:=$(RPMSOURCESDIR)/fpc
rpmcopy: distclean
install -d $(REDHATDIR)
install -d $(RPMSPECDIR)
install -d $(RPMSOURCESDIR)
# fpc.rpm
# false || is needed to workaround fpcmake sections
false || [ -d $(REDHATDIR) ] || install -d $(REDHATDIR)
false || [ -d $(RRPMSPECDIR) ] || install -d $(RPMSPECDIR)
false || [ -d $(RPMSOURCESDIR) ] || install -d $(RPMSOURCESDIR)
rm -rf $(RPMSRCDIR)
cp $(CVSINSTALL)/fpc.spec $(RPMSPECDIR)/fpc-$(RPMFPCVERSION).spec
ifndef NODOCS
@ -632,6 +632,7 @@ ifndef NODOCS
endif
find $(RPMSRCDIR) -name 'CVS*' | xargs -n1 rm -rf
cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(RPMFPCVERSION)-src.tar.gz
rm -rf $(RPMSRCDIR)
rpm: checkfpcdir rpmcopy
cd $(RPMSPECDIR) ; $(RPMBUILD) --nodeps -ba fpc-$(RPMFPCVERSION).spec