Changes: Now all path in documentation use XXXDIR variables.

This should be used by packagers to do a "make documentation" so the
documentation refer to correct path.


git-svn-id: https://subversion.renater.fr/sympa/trunk@1702 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce

Makefile.am

@@ -200,8 +200,9 @@ documentation: doc/sympa.tex.tpl doc/Makefile
 	@(cd doc && echo "making in doc/..." && \
 	$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
 	DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' \
-	MAILERPROGDIR='${MAILERPROGDIR}' ETCBINDIR='${ETCBINDIR}' \
-	CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
+	MAILERPROGDIR='${MAILERPROGDIR}' ETCBINDIR='${ETCBINDIR}' ETCDIR='${ETCDIR}' PIDDIR='${PIDDIR}' \
+	CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' EXPL_DIR='${EXPL_DIR}' NLSDIR='${NLSDIR}' SPOOLDIR='${SPOOLDIR}' \
+	SCRIPTDIR='${SCRIPTDIR}' \
 	USER='${USER}' GROUP='${GROUP}');
 
 man: doc/man8/Makefile

Makefile.in

@@ -386,8 +386,9 @@ documentation: doc/sympa.tex.tpl doc/Makefile
 	@(cd doc && echo "making in doc/..." && \
 	$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
 	DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' \
-	MAILERPROGDIR='${MAILERPROGDIR}' ETCBINDIR='${ETCBINDIR}' \
-	CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
+	MAILERPROGDIR='${MAILERPROGDIR}' ETCBINDIR='${ETCBINDIR}' ETCDIR='${ETCDIR}' PIDDIR='${PIDDIR}' \
+	CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' EXPL_DIR='${EXPL_DIR}' NLSDIR='${NLSDIR}' SPOOLDIR='${SPOOLDIR}' \
+	SCRIPTDIR='${SCRIPTDIR}' \
 	USER='${USER}' GROUP='${GROUP}');
 
 man: doc/man8/Makefile

doc/Makefile

@@ -81,7 +81,22 @@ sympa.pdf: sympa.tex
 	$(PDFLATEX) sympa.tex
 
 sympa.tex: sympa.tex.tpl
-	$(PERL) ./parse_tex.pl sympa.tex.tpl sympa.tex
+	@(DIR='${DIR}'; export DIR; \
+	BINDIR='${BINDIR}'; export BINDIR; \
+	EXPL_DIR='${EXPL_DIR}'; export EXPL_DIR; \
+	SBINDIR='${SBINDIR}'; export SBINDIR; \
+	LIBDIR='${LIBDIR}'; export LIBDIR; \
+	NLSDIR='${NLSDIR}'; export NLSDIR; \
+	SPOOLDIR='${SPOOLDIR}'; export SPOOLDIR; \
+	SCRIPTDIR='${SCRIPTDIR}'; export SCRIPTDIR; \
+	WWSBINDIR='${WWSBINDIR}'; export WWSBINDIR; \
+	MAILERPROGDIR='${MAILERPROGDIR}'; export MAILERPROGDIR; \
+	ETCBINDIR='${ETCBINDIR}'; export ETCBINDIR; \
+	ETCDIR='${ETCDIR}'; export ETCDIR; \
+	PIDDIR='${ETCDIR}'; export PIDDIR; \
+	CONFIG='${CONFIG}'; export CONFIG; \
+	WWSCONFIG='${WWSCONFIG}'; export WWSCONFIG; \
+	$(PERL) ./parse_tex.pl sympa.tex.tpl sympa.tex;)
 
 sympa.dvi: sympa.tex $(EPS)
 	cp /dev/null sympa.ind
@@ -131,6 +146,9 @@ install: makedir
 		echo "Installing documentation...$(DESTDIR)$(DOCDIR)/$$f"; \
 		cp $$f $(DESTDIR)$(DOCDIR); \
 	done
+	@if [  -d $(DESTDIR)$(DOCDIR)/sympa ]; then \
+		rm -rf $(DESTDIR)$(DOCDIR)/sympa; \
+	fi
 	cp -R sympa/ $(DESTDIR)$(DOCDIR)
 
 

doc/parse_tex.pl

@@ -43,6 +43,14 @@ my %data = ('escaped_start' => '[STARTPARSE]',
 	    'date' => &POSIX::strftime("%d %B %Y", localtime((stat($in_file))[9])),
 	    'version' => $version
 	    );
+
+## All DIR variables
+foreach my $k (keys %ENV) {
+#    if ($k =~ /DIR$/) {
+	$data{$k} = $ENV{$k};
+#    }
+}
+
 ## scenari
 foreach my $file (<../src/etc/scenari/*.*>) {
     $file =~ /\/(\w+)\.(\w+)$/;