Browse Source

+ Fixed making of docs zip

michael 23 years ago
parent
commit
e50554bfee
2 changed files with 3 additions and 3 deletions
  1. 2 2
      Makefile
  2. 1 1
      Makefile.fpc

+ 2 - 2
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

+ 1 - 1
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