From e50554bfee24a33e45a02e4e48bd397cf8dde59d Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 13 Mar 2002 08:06:10 +0000 Subject: [PATCH] + Fixed making of docs zip --- Makefile | 4 ++-- Makefile.fpc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4f4fa57f7b..acb6de65de 100644 --- a/Makefile +++ b/Makefile @@ -1698,7 +1698,7 @@ endif .PHONY: docspdf docs docsrcinstall docsrc DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs docspdf: - $(MAKE) -C docs pdfinstall + $(MAKE) -C docs pdfinstall DOCINSTALLDIR=$(PACKDIR) docs: $(MAKE) fpc_zipinstall ZIPTARGET=docspdf ZIPNAME=docs docsrcinstall: @@ -1805,7 +1805,7 @@ ifdef inUnix ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),) .PHONY: rpmcopy rpm RPMFPCVERSION:=$(shell grep 'define fpcversion' $(CVSINSTALL)/fpc.spec | awk '{ print $$3 }') -REDHATDIR=/usr/src/redhat +REDHATDIR=/usr/src/packages RPMSOURCESDIR:=$(REDHATDIR)/SOURCES RPMSPECDIR:=$(REDHATDIR)/SPECS RPMSRCDIR:=$(RPMSOURCESDIR)/fpc diff --git a/Makefile.fpc b/Makefile.fpc index b60cebfdd7..fe2716d392 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -332,7 +332,7 @@ endif DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs docspdf: - $(MAKE) -C docs pdfinstall + $(MAKE) -C docs pdfinstall DOCINSTALLDIR=$(PACKDIR) docs: $(MAKE) fpc_zipinstall ZIPTARGET=docspdf ZIPNAME=docs