-$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.itexi
- cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
+
+$(outdir)/%.pdftexi: $(outdir)/%.texi
+ $(buildscript-dir)/texi-gettext $(ISOLANG) $<
+
+$(top-build-dir)/Documentation/user/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.pdftexi
+ cd $(outdir) && \
+ texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $*.pdftexi && \
+ mkdir -p $(dir $@) && mv $*.pdf $@