Browse Source

* doc-pdf

peter 20 years ago
parent
commit
7c16358f42
2 changed files with 7 additions and 7 deletions
  1. 3 3
      Makefile
  2. 4 4
      Makefile.fpc

+ 3 - 3
Makefile

@@ -2665,8 +2665,8 @@ FPCISSSUBST+=-d DisableDocs=;
 endif
 innocheck:
 ifndef NODOCS
-ifeq ($(wildcard docs-pdf.zip),)
-	@$(ECHO) "No documentation available. Please copy the file docs-pdf.zip to this directory."
+ifeq ($(wildcard doc-pdf.zip),)
+	@$(ECHO) "No documentation available. Please copy the file doc-pdf.zip to this directory."
 	@exit 1
 endif
 endif
@@ -2678,7 +2678,7 @@ innobuild: innocheck build
 	$(DELTREE) $(INNODIR)
 	$(MKDIR) $(INNODIR)
 ifndef NODOCS
-	unzip -d $(INNODIR) docs-pdf.zip
+	unzip -d $(INNODIR) doc-pdf.zip
 endif
 	$(MAKE) install INSTALL_PREFIX=$(INNODIR)
 	compiler/utils/fpcsubst -i install/fpc.ist -o $(INNODIR)/fpc.iss $(FPCISSSUBST)

+ 4 - 4
Makefile.fpc

@@ -684,9 +684,9 @@ endif
 
 innocheck:
 ifndef NODOCS
-# Check for docs-pdf.zip
-ifeq ($(wildcard docs-pdf.zip),)
-        @$(ECHO) "No documentation available. Please copy the file docs-pdf.zip to this directory."
+# Check for doc-pdf.zip
+ifeq ($(wildcard doc-pdf.zip),)
+        @$(ECHO) "No documentation available. Please copy the file doc-pdf.zip to this directory."
         @exit 1
 endif
 endif
@@ -700,7 +700,7 @@ innobuild: innocheck build
         $(DELTREE) $(INNODIR)
         $(MKDIR) $(INNODIR)
 ifndef NODOCS
-        unzip -d $(INNODIR) docs-pdf.zip
+        unzip -d $(INNODIR) doc-pdf.zip
 endif
         $(MAKE) install INSTALL_PREFIX=$(INNODIR)
         compiler/utils/fpcsubst -i install/fpc.ist -o $(INNODIR)/fpc.iss $(FPCISSSUBST)