From b767dd8ca39700ab7c802849dd734c9587bc5c5d Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sat, 29 Nov 2003 13:58:31 +0000
Subject: [PATCH]   * redhat dir fix

---
 Makefile     |  9 +++++----
 Makefile.fpc | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 7c8200e157..f3804a3f4b 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/Makefile.fpc b/Makefile.fpc
index b0cda2b375..afcdc02860 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -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