From 8c20a748bd0373daa66bd39bb303a1a8b61c6e2d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Thu, 8 Apr 2004 11:18:59 +0000
Subject: Fix samba-docs build after svn conversion and Samba3 By Example
 addition. Now we are able to build everything in samba-docs properly. (This
 used to be commit bb09f771958150e9465a5dc9d8e62aa8477c17a4)

---
 docs/Makefile.in | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'docs/Makefile.in')

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 7602476cb4..791a1532a9 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -31,24 +31,25 @@ LATEX += --interaction nonstopmode
 endif
 
 # Paths
-OUTPUTDIR = output
-ARCHIVEDIR = output/archive
+TOPDIR = $(shell pwd)
+OUTPUTDIR = $(TOPDIR)/output
+ARCHIVEDIR = $(OUTPUTDIR)/archive
 SRCDIR = @srcdir@
 MANDIR=$(OUTPUTDIR)/manpages
 EPSTOPDF = @EPSTOPDF@
-MANPAGEDIR = manpages
-HOWTODIR = howto
+MANPAGEDIR = $(TOPDIR)/manpages
+HOWTODIR = $(TOPDIR)/howto
 MAKEINDEX = @MAKEINDEX@
 IMAGEPROJDIR = $(HOWTODIR)/imagefiles
-GUIDEDOC = guide
-EXAMPLESDIR = examples
-DEVDOC = devdoc
-SMBDOTCONFDOC = smbdotconf
+GUIDEDOC = $(TOPDIR)/guide
+EXAMPLESDIR = $(TOPDIR)/examples
+DEVDOC = $(TOPDIR)/devdoc
+SMBDOTCONFDOC = $(TOPDIR)/smbdotconf
 PSDIR = $(OUTPUTDIR)
 PDFDIR = $(OUTPUTDIR)
 DVIDIR = $(OUTPUTDIR)
 TXTDIR = $(OUTPUTDIR)/textdocs
-FAQHOWTODIR = faq
+FAQHOWTODIR = $(TOPDIR)/faq
 FAQDIR = $(OUTPUTDIR)/faq
 HTMLDIR=$(OUTPUTDIR)/htmldocs
 PLUCKERDIR=$(OUTPUTDIR)/plucker
@@ -153,7 +154,7 @@ clean:
 	rm -f $(PLUCKERDIR)/*.pdb
 
 # Text files
-$(TXTDIR):
+$(TXTDIR): $(OUTPUTDIR)
 	mkdir $(TXTDIR)
 
 $(TXTDIR)/%.txt: %.xml
@@ -196,12 +197,14 @@ $(PSDIR)/%.ps: $(DVIDIR)/%.dvi
 xslt/figures/%.pdf: xslt/figures/%.eps
 	$(EPSTOPDF) $<
 
+$(OUTPUTDIR):
+	mkdir $(OUTPUTDIR)
 # Single large HTML files
 
-$(HTMLDIR):
+$(HTMLDIR): $(OUTPUTDIR)
 	mkdir $(HTMLDIR)
 
-$(PLUCKERDIR):
+$(PLUCKERDIR): $(OUTPUTDIR)
 	mkdir $(PLUCKERDIR)
 
 CSS: $(HTMLDIR) xslt/html/samba.css
@@ -248,7 +251,7 @@ smb.conf.5.xml: $(SMBDOTCONFDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.all.
  		$(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/parameters.service.xml 
 	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-$(MANDIR): 
+$(MANDIR): $(OUTPUTDIR)
 	mkdir $(MANDIR)
 
 $(MANDIR)/%: %.xml
-- 
cgit