From 36258f61b393fcf857f85cce1a279e330bace17d Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Thu, 22 Jan 2004 01:56:50 +0000
Subject: [PATCH] requested by radhika:

 * remove lustre-HOWTO from cvs/build, as it's now on a wiki page.

 * disable lustre.pdf building by default.
---
 lustre/configure.in    |  2 +-
 lustre/doc/Makefile.am | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lustre/configure.in b/lustre/configure.in
index c60f868..9eda4b6 100644
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -23,7 +23,7 @@ AC_ARG_ENABLE(doc, [  --disable-doc skip creation of pdf documentation],
 			    ENABLE_DOC=0
 			fi
 		   ],
-		   [ ENABLE_DOC=1 ])
+		   [ ENABLE_DOC=0 ])
 AM_CONDITIONAL(DOC, test x$ENABLE_DOC = x1)
 AC_SUBST(ENABLE_DOC)
 
diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index 8302275..dbffef4 100644
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -15,11 +15,9 @@ TEXEXPAND = texexpand
 SUFFIXES = .lin .lyx .pdf .ps .sgml .html .txt .tex .fig .eps .dvi
 
 if DOC
-  DOCS = lustre.pdf lustre-HOWTO.txt
-  HOWTODOC = lustre-HOWTO.txt
+  DOCS = lustre.pdf
 else
   DOCS =
-  HOWTODOC =
 endif
 
 IMAGES := $(patsubst %.fig,%.eps,$(wildcard *.fig))
@@ -28,12 +26,12 @@ LYXFILES= $(filter-out $(patsubst %.lin,%.lyx,$(wildcard *.lin)),\
 
 MAINTAINERCLEANFILES =  $(IMAGES) $(DOCS) $(VERSIONED)
 CLEANFILES = *.aux *.tex doc.old/*.aux doc.old/*.tex *.eps *.log *.pdf
-VERSIONED = lustre-HOWTO.lyx lustre.lyx doc.old/lustre-HOWTO.lyx doc.old/lustre.lyx
+VERSIONED = lustre.lyx doc.old/lustre.lyx
 GENERATED = $(VERSIONED) lustre-full.tex lustre-chbar.tex
 
 EXTRA_DIST = chbar.sh postbar tex2pdf $(DOCS) $(IMAGES) $(LYXFILES) lustre.bib
 
-all: $(HOWTODOC)
+all:
 docs: $(DOCS)
 
 # These variables are set by lbuild/check-build.
@@ -79,7 +77,7 @@ $(VERSIONED) : %.lyx: %.lin Makefile
 .ps.pdf:
 	$(PS2PDF) $< $@
 
-lustre.tex lustre.pdf lustre.txt lustre.html: $(IMAGES) $(LYXFILES) lustre-HOWTO.lyx
+lustre.tex lustre.pdf lustre.txt lustre.html: $(IMAGES) $(LYXFILES)
 .fig.eps:
 	-fig2dev -L eps $< > $@
 
@@ -105,8 +103,6 @@ lustre-chbar-nopdf.tex: lustre-chbar.tex
 %-chbar.tex: chbar.sh postbar doc.old/%-full.tex %-full.tex
 	$(SHELL) $(srcdir)/chbar.sh doc.old/$*-full.tex $*-full.tex | $(srcdir)/postbar > $@
 
-# This rule needs to come before the next %-full.tex rule.
-doc.old/lustre.tex: doc.old/lustre-HOWTO.lyx
 doc.old/%-full.tex: doc.old/%.tex
 	cd doc.old && $(TEXEXPAND) -texinputs=. -output=$*-full.tex $*.tex
 
@@ -115,7 +111,7 @@ doc.old/%-full.tex: doc.old/%.tex
 	$(TEXEXPAND) -texinputs=. -texinputs=$(srcdir) -output=$@ $<
 
 # Check out the old directory if it doesn't exist.
-doc.old/lustre.lin doc.old/lustre-HOWTO.lin:
+doc.old/lustre.lin:
 	@if test "X$(OLD)" = X; then \
 	  echo "You must populate doc.old or specify a CVS tag like OLD=v0_5_1"; \
 	  exit 1; \
-- 
1.8.3.1