summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Makefile.in7
-rw-r--r--docs/entities/global.entities2
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 791a1532a9..4d72029eca 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -43,7 +43,7 @@ MAKEINDEX = @MAKEINDEX@
IMAGEPROJDIR = $(HOWTODIR)/imagefiles
GUIDEDOC = $(TOPDIR)/guide
EXAMPLESDIR = $(TOPDIR)/examples
-DEVDOC = $(TOPDIR)/devdoc
+DEVDOC = $(TOPDIR)/devel
SMBDOTCONFDOC = $(TOPDIR)/smbdotconf
PSDIR = $(OUTPUTDIR)
PDFDIR = $(OUTPUTDIR)
@@ -108,14 +108,14 @@ html-single: $(HTMLDIR) CSS $(HTMLDIR)/Samba-HOWTO-Collection.html $(HTMLDIR)/S
@if [ ! -d $(HTMLDIR)/images/ ]; then \
mkdir $(HTMLDIR)/images/; \
fi \
- && cp -p projdoc/imagefiles/*png $(HTMLDIR)/images/
+ && cp -p $(IMAGEPROJDIR)/*png $(HTMLDIR)/images/
html: $(HTMLDIR) CSS Samba-HOWTO-Collection.xml $(HTMLDIR)/Samba-Developers-Guide.html
$(XSLTPROC) -o "$(HTMLDIR)/" xslt/html-chunk.xsl Samba-HOWTO-Collection.xml
@if [ ! -d $(HTMLDIR)/images/ ]; then \
mkdir $(HTMLDIR)/images/; \
fi \
- && cp -p projdoc/imagefiles/*png $(HTMLDIR)/images/
+ && cp -p $(IMAGEPROJDIR)/*png $(HTMLDIR)/images/
manpages: $(MANDIR) $(MANPAGES)
@@ -203,6 +203,7 @@ $(OUTPUTDIR):
$(HTMLDIR): $(OUTPUTDIR)
mkdir $(HTMLDIR)
+ mkdir $(HTMLDIR)/images
$(PLUCKERDIR): $(OUTPUTDIR)
mkdir $(PLUCKERDIR)
diff --git a/docs/entities/global.entities b/docs/entities/global.entities
index c4b1d7f33e..7683668297 100644
--- a/docs/entities/global.entities
+++ b/docs/entities/global.entities
@@ -545,7 +545,7 @@ an Active Directory environment.
<!ENTITY problems SYSTEM "../howto/Problems.xml">
<!ENTITY unicode SYSTEM "../howto/Unicode.xml">
<!ENTITY attributions SYSTEM "../howto/attributions.xml">
-<!ENTITY attributions-dev SYSTEM "../devdoc/attributions.xml">
+<!ENTITY attributions-dev SYSTEM "../devel/attributions.xml">
<!ENTITY glossary SYSTEM "../howto/glossary.xml">
<!ENTITY foreword-tridge SYSTEM "../howto/foreword-tridge.xml">