From 80fabe9783deda975b5980ce8ea76f034b04de68 Mon Sep 17 00:00:00 2001 From: Paul Richards Date: Sun, 18 May 1997 21:58:11 +0000 Subject: [PATCH] Allow DOCS to be overriden and conditionally clear the SUBDIR. This is to overcome a problem in building this part of the tree from the new build structure. The current system relies on picking up a Makefile.inc from a parent directory that sets WEBBASE and as the subdirectories are entered this Makefile.inc is from a different parent directory with a different WEBBASE setting. This wasn't something I could workaround when building from the new directory structure so as a short term cludge I now enter this directory twice, once with NEW_BUILD defined so the subdirs are skipped and once with DOCS set to null so only the directories are built and WEBBASE is set appropriately in each case. --- data/releases/Makefile | 6 +++++- en/releases/Makefile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/data/releases/Makefile b/data/releases/Makefile index a1e6343d04..02442ac7b9 100644 --- a/data/releases/Makefile +++ b/data/releases/Makefile @@ -1,6 +1,10 @@ -DOCS= index.sgml snapshots.sgml +DOCS?= index.sgml snapshots.sgml SUBDIR= 1.1 1.1.5 2.0 2.0.5A 2.0.5R 2.0A 2.1R 2.1.5R 2.1.6R 2.1.7R 2.2R SUBDIR+= 2.2.1R +.if defined $(NEW_BUILD) +SUBDIR= +.endif + .include "../web.mk" diff --git a/en/releases/Makefile b/en/releases/Makefile index a1e6343d04..02442ac7b9 100644 --- a/en/releases/Makefile +++ b/en/releases/Makefile @@ -1,6 +1,10 @@ -DOCS= index.sgml snapshots.sgml +DOCS?= index.sgml snapshots.sgml SUBDIR= 1.1 1.1.5 2.0 2.0.5A 2.0.5R 2.0A 2.1R 2.1.5R 2.1.6R 2.1.7R 2.2R SUBDIR+= 2.2.1R +.if defined $(NEW_BUILD) +SUBDIR= +.endif + .include "../web.mk"