View Issue Details

IDProjectCategoryView StatusLast Update
0003509ScribusBuild Systempublic2006-03-29 22:36
ReporterplinnellAssigned Tocbradney  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version1.3.3.1cvs 
Fixed in Version1.2.5cvs 
Summary0003509: Move the docs to FHS compliant location
Descriptionsee: https://bugs.gentoo.org/show_bug.cgi?id=127405
TagsNo tags attached.
Patch

Activities

plinnell

2006-03-26 21:16

viewer   ~0009481

Reminder sent to: hanno

2006-03-26 22:20

 

scribus-1.2-fhs.diff (135,709 bytes)   
diff -Naur Scribus/scribus/doc/cs/tutorials/short-words/Makefile.am Scribus-fhs/scribus/doc/cs/tutorials/short-words/Makefile.am
--- Scribus/scribus/doc/cs/tutorials/short-words/Makefile.am	2005-01-23 21:33:21.000000000 +0100
+++ Scribus-fhs/scribus/doc/cs/tutorials/short-words/Makefile.am	2006-03-27 00:12:59.960608000 +0200
@@ -1,24 +1,24 @@
 EXTRA_DIST = menu.xml after_short_words.png before_short_words.png dialog.png menu.png short-words-manual.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/menu.xml
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/after_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/before_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/dialog.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/menu.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/short-words-manual.html
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/menu.xml
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/after_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/before_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/dialog.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/menu.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/short-words-manual.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/after_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/before_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/dialog.png
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/menu.png
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/short-words-manual.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/after_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/before_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/dialog.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/menu.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/short-words-manual.html
diff -Naur Scribus/scribus/doc/de/Makefile.am Scribus-fhs/scribus/doc/de/Makefile.am
--- Scribus/scribus/doc/de/Makefile.am	2005-11-17 00:04:07.000000000 +0100
+++ Scribus-fhs/scribus/doc/de/Makefile.am	2006-03-27 00:12:59.968608500 +0200
@@ -3,222 +3,222 @@
 EXTRA_DIST = about1.html about2.html cms.html cms2.html cms3.html cms4.html codingstandards.html contributions.html cross-platform.html cups.html  developers.html  doccopyright.html docinfo.html download.html faq1.html faq2.html faq3.html fonts1.html fonts2.html fonts3.html fonts4.html fonts5.html gettexthowto.html gsfont.html hyphenator.html  importhints2.html importhints.html importhints3.html index.html irc.html install1.html install2.html install3.html install.html install-dpkg.html intro.html javascriptpdf.html keys.html machints1.html machints2.html menu.xml moncal.html mouse.html pagetemplate1.html parallel-install.html pdfexport1.html pdfexport2.html pdfexport3.html pdfexport4.html pdflavor.html pdfx3.html pdf_form.html plugin_howto.html prepress.html print1.html print2.html print3.html  readme.html resources.html scprinters.html scribuscopyright.html scribusfileformat.html scribus-svg.html scripter1.html scripter-extensions.html scripterapi-color.html scripterapi-constants.html scripterapi-dialogs.html scripterapi-doc.html scripterapi-font.html scripterapi-getobjprop.html scripterapi.html scripterapi-layer.html scripterapi-manobj.html scripterapi-object.html scripterapi-page.html scripterapi-select.html scripterapi-setobjprop.html scripterapi-textframes.html scripter-faq.html scripterapi-pydoc.html scripterapi-PDFfile.html scripterapi-Printer.html scripterapi-ImageExport.html settings1.html specs.html  short-words.html toolbox10.html toolbox11.html toolbox12.html toolbox13.html toolbox1.html toolbox2.html toolbox3.html toolbox4.html toolbox5.html toolbox6.html toolbox7.html toolbox8.html toolbox9.html toolbox.html topten.html translation_howto.html  otherinfo.html documentation.html tutorials.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/de/
-	$(INSTALL_DATA) $(srcdir)/about1.html $(prefix)/share/scribus/doc/de/about1.html
-	$(INSTALL_DATA) $(srcdir)/about2.html $(prefix)/share/scribus/doc/de/about2.html
-	$(INSTALL_DATA) $(srcdir)/cms.html $(prefix)/share/scribus/doc/de/cms.html
-	$(INSTALL_DATA) $(srcdir)/cms2.html $(prefix)/share/scribus/doc/de/cms2.html
-	$(INSTALL_DATA) $(srcdir)/cms3.html $(prefix)/share/scribus/doc/de/cms3.html
-	$(INSTALL_DATA) $(srcdir)/cms4.html $(prefix)/share/scribus/doc/de/cms4.html
-	$(INSTALL_DATA) $(srcdir)/codingstandards.html $(prefix)/share/scribus/doc/de/codingstandards.html
-	$(INSTALL_DATA) $(srcdir)/contributions.html $(prefix)/share/scribus/doc/de/contributions.html
-	$(INSTALL_DATA) $(srcdir)/cross-platform.html $(prefix)/share/scribus/doc/de/cross-platform.html
-	$(INSTALL_DATA) $(srcdir)/cups.html $(prefix)/share/scribus/doc/de/cups.html
-	$(INSTALL_DATA) $(srcdir)/developers.html $(prefix)/share/scribus/doc/de/developers.html
-	$(INSTALL_DATA) $(srcdir)/doccopyright.html $(prefix)/share/scribus/doc/de/doccopyright.html
-	$(INSTALL_DATA) $(srcdir)/docinfo.html $(prefix)/share/scribus/doc/de/docinfo.html
-	$(INSTALL_DATA) $(srcdir)/download.html $(prefix)/share/scribus/doc/de/download.html
-	$(INSTALL_DATA) $(srcdir)/faq1.html $(prefix)/share/scribus/doc/de/faq1.html
-	$(INSTALL_DATA) $(srcdir)/faq2.html $(prefix)/share/scribus/doc/de/faq2.html
-	$(INSTALL_DATA) $(srcdir)/faq3.html $(prefix)/share/scribus/doc/de/faq3.html
-	$(INSTALL_DATA) $(srcdir)/fonts1.html $(prefix)/share/scribus/doc/de/fonts1.html
-	$(INSTALL_DATA) $(srcdir)/fonts2.html $(prefix)/share/scribus/doc/de/fonts2.html
-	$(INSTALL_DATA) $(srcdir)/fonts3.html $(prefix)/share/scribus/doc/de/fonts3.html
-	$(INSTALL_DATA) $(srcdir)/fonts4.html $(prefix)/share/scribus/doc/de/fonts4.html
-	$(INSTALL_DATA) $(srcdir)/fonts5.html $(prefix)/share/scribus/doc/de/fonts5.html
-	$(INSTALL_DATA) $(srcdir)/gettexthowto.html $(prefix)/share/scribus/doc/de/gettexthowto.html
-	$(INSTALL_DATA) $(srcdir)/gsfont.html $(prefix)/share/scribus/doc/de/gsfont.html
-	$(INSTALL_DATA) $(srcdir)/hyphenator.html $(prefix)/share/scribus/doc/de/hyphenator.html
-	$(INSTALL_DATA) $(srcdir)/importhints.html $(prefix)/share/scribus/doc/de/importhints.html
-	$(INSTALL_DATA) $(srcdir)/importhints1.html $(prefix)/share/scribus/doc/de/importhints1.html
-	$(INSTALL_DATA) $(srcdir)/importhints2.html $(prefix)/share/scribus/doc/de/importhints2.html
-	$(INSTALL_DATA) $(srcdir)/importhints3.html $(prefix)/share/scribus/doc/de/importhints3.html
-	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/share/scribus/doc/de/index.html
-	$(INSTALL_DATA) $(srcdir)/install1.html $(prefix)/share/scribus/doc/de/install1.html
-	$(INSTALL_DATA) $(srcdir)/install2.html $(prefix)/share/scribus/doc/de/install2.html
-	$(INSTALL_DATA) $(srcdir)/install3.html $(prefix)/share/scribus/doc/de/install3.html
-	$(INSTALL_DATA) $(srcdir)/install.html $(prefix)/share/scribus/doc/de/install.html
-	$(INSTALL_DATA) $(srcdir)/install-dpkg.html $(prefix)/share/scribus/doc/de/install-dpkg.html
-	$(INSTALL_DATA) $(srcdir)/intro.html $(prefix)/share/scribus/doc/de/intro.html
-	$(INSTALL_DATA) $(srcdir)/irc.html $(prefix)/share/scribus/doc/de/irc.html
-	$(INSTALL_DATA) $(srcdir)/javascriptpdf.html $(prefix)/share/scribus/doc/de/javascriptpdf.html
-	$(INSTALL_DATA) $(srcdir)/keys.html $(prefix)/share/scribus/doc/de/keys.html
-	$(INSTALL_DATA) $(srcdir)/machints1.html $(prefix)/share/scribus/doc/de/machints1.html
-	$(INSTALL_DATA) $(srcdir)/machints2.html $(prefix)/share/scribus/doc/de/machints2.html
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/de/menu.xml
-	$(INSTALL_DATA) $(srcdir)/moncal.html $(prefix)/share/scribus/doc/de/moncal.html
-	$(INSTALL_DATA) $(srcdir)/mouse.html $(prefix)/share/scribus/doc/de/mouse.html
-	$(INSTALL_DATA) $(srcdir)/pagetemplate1.html $(DESTDIR)$(prefix)/share/scribus/doc/de/pagetemplate1.html
-	$(INSTALL_DATA) $(srcdir)/parallel-install.html $(prefix)/share/scribus/doc/de/parallel-install.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport1.html $(prefix)/share/scribus/doc/de/pdfexport1.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport2.html $(prefix)/share/scribus/doc/de/pdfexport2.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport3.html $(prefix)/share/scribus/doc/de/pdfexport3.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport4.html $(prefix)/share/scribus/doc/de/pdfexport4.html
-	$(INSTALL_DATA) $(srcdir)/pdflavor.html $(prefix)/share/scribus/doc/de/pdflavor.html
-	$(INSTALL_DATA) $(srcdir)/pdfx3.html $(prefix)/share/scribus/doc/de/pdfx3.html
-	$(INSTALL_DATA) $(srcdir)/plugin_howto.html $(prefix)/share/scribus/doc/de/plugin_howto.html
-	$(INSTALL_DATA) $(srcdir)/prepress.html $(prefix)/share/scribus/doc/de/prepress.html
-	$(INSTALL_DATA) $(srcdir)/print1.html $(prefix)/share/scribus/doc/de/print1.html
-	$(INSTALL_DATA) $(srcdir)/print2.html $(prefix)/share/scribus/doc/de/print2.html
-	$(INSTALL_DATA) $(srcdir)/print3.html $(prefix)/share/scribus/doc/de/print3.html
-	$(INSTALL_DATA) $(srcdir)/readme.html $(prefix)/share/scribus/doc/de/readme.html
-	$(INSTALL_DATA) $(srcdir)/resources.html $(prefix)/share/scribus/doc/de/resources.html
-	$(INSTALL_DATA) $(srcdir)/scprinters.html $(prefix)/share/scribus/doc/de/scprinters.html
-	$(INSTALL_DATA) $(srcdir)/scribuscopyright.html $(prefix)/share/scribus/doc/de/scribuscopyright.html
-	$(INSTALL_DATA) $(srcdir)/scribusfileformat.html $(prefix)/share/scribus/doc/de/scribusfileformat.html
-	$(INSTALL_DATA) $(srcdir)/scribus-svg.html $(prefix)/share/scribus/doc/de/scribus-svg.html
-	$(INSTALL_DATA) $(srcdir)/scripter1.html $(prefix)/share/scribus/doc/de/scripter1.html
-	$(INSTALL_DATA) $(srcdir)/scripter-extensions.html $(prefix)/share/scribus/doc/de/scripter-extensions.html
-	$(INSTALL_DATA) $(srcdir)/scripter-faq.html $(prefix)/share/scribus/doc/de/scripter-faq.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-color.html $(prefix)/share/scribus/doc/de/scripterapi-color.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-constants.html $(prefix)/share/scribus/doc/de/scripterapi-constants.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-dialogs.html $(prefix)/share/scribus/doc/de/scripterapi-dialogs.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-doc.html $(prefix)/share/scribus/doc/de/scripterapi-doc.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-font.html $(prefix)/share/scribus/doc/de/scripterapi-font.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-getobjprop.html $(prefix)/share/scribus/doc/de/scripterapi-getobjprop.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi.html $(prefix)/share/scribus/doc/de/scripterapi.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-layer.html $(prefix)/share/scribus/doc/de/scripterapi-layer.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-manobj.html $(prefix)/share/scribus/doc/de/scripterapi-manobj.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-object.html $(prefix)/share/scribus/doc/de/scripterapi-object.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-page.html $(prefix)/share/scribus/doc/de/scripterapi-page.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-select.html $(prefix)/share/scribus/doc/de/scripterapi-select.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-setobjprop.html $(prefix)/share/scribus/doc/de/scripterapi-setobjprop.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-textframes.html $(prefix)/share/scribus/doc/de/scripterapi-textframes.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-PDFfile.html $(prefix)/share/scribus/doc/de/scripterapi-PDFfile.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-Printer.html $(prefix)/share/scribus/doc/de/scripterapi-Printer.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-ImageExport.html $(prefix)/share/scribus/doc/de/scripterapi-ImageExport.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-pydoc.html $(prefix)/share/scribus/doc/de/scripterapi-pydoc.html
-	$(INSTALL_DATA) $(srcdir)/settings1.html $(prefix)/share/scribus/doc/de/settings1.html
-	$(INSTALL_DATA) $(srcdir)/specs.html $(prefix)/share/scribus/doc/de/specs.html
-	$(INSTALL_DATA) $(srcdir)/short-words.html $(prefix)/share/scribus/doc/de/short-words.html
-	$(INSTALL_DATA) $(srcdir)/toolbox10.html $(prefix)/share/scribus/doc/de/toolbox10.html
-	$(INSTALL_DATA) $(srcdir)/toolbox11.html $(prefix)/share/scribus/doc/de/toolbox11.html
-	$(INSTALL_DATA) $(srcdir)/toolbox12.html $(prefix)/share/scribus/doc/de/toolbox12.html
-	$(INSTALL_DATA) $(srcdir)/toolbox13.html $(prefix)/share/scribus/doc/de/toolbox13.html
-	$(INSTALL_DATA) $(srcdir)/toolbox1.html $(prefix)/share/scribus/doc/de/toolbox1.html
-	$(INSTALL_DATA) $(srcdir)/toolbox2.html $(prefix)/share/scribus/doc/de/toolbox2.html
-	$(INSTALL_DATA) $(srcdir)/toolbox3.html $(prefix)/share/scribus/doc/de/toolbox3.html
-	$(INSTALL_DATA) $(srcdir)/toolbox4.html $(prefix)/share/scribus/doc/de/toolbox4.html
-	$(INSTALL_DATA) $(srcdir)/toolbox5.html $(prefix)/share/scribus/doc/de/toolbox5.html
-	$(INSTALL_DATA) $(srcdir)/toolbox6.html $(prefix)/share/scribus/doc/de/toolbox6.html
-	$(INSTALL_DATA) $(srcdir)/toolbox7.html $(prefix)/share/scribus/doc/de/toolbox7.html
-	$(INSTALL_DATA) $(srcdir)/toolbox8.html $(prefix)/share/scribus/doc/de/toolbox8.html
-	$(INSTALL_DATA) $(srcdir)/toolbox9.html $(prefix)/share/scribus/doc/de/toolbox9.html
-	$(INSTALL_DATA) $(srcdir)/toolbox.html $(prefix)/share/scribus/doc/de/toolbox.html
-	$(INSTALL_DATA) $(srcdir)/topten.html $(prefix)/share/scribus/doc/de/topten.html
-	$(INSTALL_DATA) $(srcdir)/translation_howto.html $(prefix)/share/scribus/doc/de/translation_howto.html
-	$(INSTALL_DATA) $(srcdir)/pdf_form.html $(prefix)/share/scribus/doc/de/pdf_form.html
-	$(INSTALL_DATA) $(srcdir)/otherinfo.html $(prefix)/share/scribus/doc/de/otherinfo.html
-	$(INSTALL_DATA) $(srcdir)/documentation.html $(prefix)/share/scribus/doc/de/documentation.html
-	$(INSTALL_DATA) $(srcdir)/tutorials.html $(prefix)/share/scribus/doc/de/tutorials.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/de/
+	$(INSTALL_DATA) $(srcdir)/about1.html $(prefix)/share/doc/scribus-$(VERSION)/de/about1.html
+	$(INSTALL_DATA) $(srcdir)/about2.html $(prefix)/share/doc/scribus-$(VERSION)/de/about2.html
+	$(INSTALL_DATA) $(srcdir)/cms.html $(prefix)/share/doc/scribus-$(VERSION)/de/cms.html
+	$(INSTALL_DATA) $(srcdir)/cms2.html $(prefix)/share/doc/scribus-$(VERSION)/de/cms2.html
+	$(INSTALL_DATA) $(srcdir)/cms3.html $(prefix)/share/doc/scribus-$(VERSION)/de/cms3.html
+	$(INSTALL_DATA) $(srcdir)/cms4.html $(prefix)/share/doc/scribus-$(VERSION)/de/cms4.html
+	$(INSTALL_DATA) $(srcdir)/codingstandards.html $(prefix)/share/doc/scribus-$(VERSION)/de/codingstandards.html
+	$(INSTALL_DATA) $(srcdir)/contributions.html $(prefix)/share/doc/scribus-$(VERSION)/de/contributions.html
+	$(INSTALL_DATA) $(srcdir)/cross-platform.html $(prefix)/share/doc/scribus-$(VERSION)/de/cross-platform.html
+	$(INSTALL_DATA) $(srcdir)/cups.html $(prefix)/share/doc/scribus-$(VERSION)/de/cups.html
+	$(INSTALL_DATA) $(srcdir)/developers.html $(prefix)/share/doc/scribus-$(VERSION)/de/developers.html
+	$(INSTALL_DATA) $(srcdir)/doccopyright.html $(prefix)/share/doc/scribus-$(VERSION)/de/doccopyright.html
+	$(INSTALL_DATA) $(srcdir)/docinfo.html $(prefix)/share/doc/scribus-$(VERSION)/de/docinfo.html
+	$(INSTALL_DATA) $(srcdir)/download.html $(prefix)/share/doc/scribus-$(VERSION)/de/download.html
+	$(INSTALL_DATA) $(srcdir)/faq1.html $(prefix)/share/doc/scribus-$(VERSION)/de/faq1.html
+	$(INSTALL_DATA) $(srcdir)/faq2.html $(prefix)/share/doc/scribus-$(VERSION)/de/faq2.html
+	$(INSTALL_DATA) $(srcdir)/faq3.html $(prefix)/share/doc/scribus-$(VERSION)/de/faq3.html
+	$(INSTALL_DATA) $(srcdir)/fonts1.html $(prefix)/share/doc/scribus-$(VERSION)/de/fonts1.html
+	$(INSTALL_DATA) $(srcdir)/fonts2.html $(prefix)/share/doc/scribus-$(VERSION)/de/fonts2.html
+	$(INSTALL_DATA) $(srcdir)/fonts3.html $(prefix)/share/doc/scribus-$(VERSION)/de/fonts3.html
+	$(INSTALL_DATA) $(srcdir)/fonts4.html $(prefix)/share/doc/scribus-$(VERSION)/de/fonts4.html
+	$(INSTALL_DATA) $(srcdir)/fonts5.html $(prefix)/share/doc/scribus-$(VERSION)/de/fonts5.html
+	$(INSTALL_DATA) $(srcdir)/gettexthowto.html $(prefix)/share/doc/scribus-$(VERSION)/de/gettexthowto.html
+	$(INSTALL_DATA) $(srcdir)/gsfont.html $(prefix)/share/doc/scribus-$(VERSION)/de/gsfont.html
+	$(INSTALL_DATA) $(srcdir)/hyphenator.html $(prefix)/share/doc/scribus-$(VERSION)/de/hyphenator.html
+	$(INSTALL_DATA) $(srcdir)/importhints.html $(prefix)/share/doc/scribus-$(VERSION)/de/importhints.html
+	$(INSTALL_DATA) $(srcdir)/importhints1.html $(prefix)/share/doc/scribus-$(VERSION)/de/importhints1.html
+	$(INSTALL_DATA) $(srcdir)/importhints2.html $(prefix)/share/doc/scribus-$(VERSION)/de/importhints2.html
+	$(INSTALL_DATA) $(srcdir)/importhints3.html $(prefix)/share/doc/scribus-$(VERSION)/de/importhints3.html
+	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/share/doc/scribus-$(VERSION)/de/index.html
+	$(INSTALL_DATA) $(srcdir)/install1.html $(prefix)/share/doc/scribus-$(VERSION)/de/install1.html
+	$(INSTALL_DATA) $(srcdir)/install2.html $(prefix)/share/doc/scribus-$(VERSION)/de/install2.html
+	$(INSTALL_DATA) $(srcdir)/install3.html $(prefix)/share/doc/scribus-$(VERSION)/de/install3.html
+	$(INSTALL_DATA) $(srcdir)/install.html $(prefix)/share/doc/scribus-$(VERSION)/de/install.html
+	$(INSTALL_DATA) $(srcdir)/install-dpkg.html $(prefix)/share/doc/scribus-$(VERSION)/de/install-dpkg.html
+	$(INSTALL_DATA) $(srcdir)/intro.html $(prefix)/share/doc/scribus-$(VERSION)/de/intro.html
+	$(INSTALL_DATA) $(srcdir)/irc.html $(prefix)/share/doc/scribus-$(VERSION)/de/irc.html
+	$(INSTALL_DATA) $(srcdir)/javascriptpdf.html $(prefix)/share/doc/scribus-$(VERSION)/de/javascriptpdf.html
+	$(INSTALL_DATA) $(srcdir)/keys.html $(prefix)/share/doc/scribus-$(VERSION)/de/keys.html
+	$(INSTALL_DATA) $(srcdir)/machints1.html $(prefix)/share/doc/scribus-$(VERSION)/de/machints1.html
+	$(INSTALL_DATA) $(srcdir)/machints2.html $(prefix)/share/doc/scribus-$(VERSION)/de/machints2.html
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/de/menu.xml
+	$(INSTALL_DATA) $(srcdir)/moncal.html $(prefix)/share/doc/scribus-$(VERSION)/de/moncal.html
+	$(INSTALL_DATA) $(srcdir)/mouse.html $(prefix)/share/doc/scribus-$(VERSION)/de/mouse.html
+	$(INSTALL_DATA) $(srcdir)/pagetemplate1.html $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/de/pagetemplate1.html
+	$(INSTALL_DATA) $(srcdir)/parallel-install.html $(prefix)/share/doc/scribus-$(VERSION)/de/parallel-install.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport1.html $(prefix)/share/doc/scribus-$(VERSION)/de/pdfexport1.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport2.html $(prefix)/share/doc/scribus-$(VERSION)/de/pdfexport2.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport3.html $(prefix)/share/doc/scribus-$(VERSION)/de/pdfexport3.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport4.html $(prefix)/share/doc/scribus-$(VERSION)/de/pdfexport4.html
+	$(INSTALL_DATA) $(srcdir)/pdflavor.html $(prefix)/share/doc/scribus-$(VERSION)/de/pdflavor.html
+	$(INSTALL_DATA) $(srcdir)/pdfx3.html $(prefix)/share/doc/scribus-$(VERSION)/de/pdfx3.html
+	$(INSTALL_DATA) $(srcdir)/plugin_howto.html $(prefix)/share/doc/scribus-$(VERSION)/de/plugin_howto.html
+	$(INSTALL_DATA) $(srcdir)/prepress.html $(prefix)/share/doc/scribus-$(VERSION)/de/prepress.html
+	$(INSTALL_DATA) $(srcdir)/print1.html $(prefix)/share/doc/scribus-$(VERSION)/de/print1.html
+	$(INSTALL_DATA) $(srcdir)/print2.html $(prefix)/share/doc/scribus-$(VERSION)/de/print2.html
+	$(INSTALL_DATA) $(srcdir)/print3.html $(prefix)/share/doc/scribus-$(VERSION)/de/print3.html
+	$(INSTALL_DATA) $(srcdir)/readme.html $(prefix)/share/doc/scribus-$(VERSION)/de/readme.html
+	$(INSTALL_DATA) $(srcdir)/resources.html $(prefix)/share/doc/scribus-$(VERSION)/de/resources.html
+	$(INSTALL_DATA) $(srcdir)/scprinters.html $(prefix)/share/doc/scribus-$(VERSION)/de/scprinters.html
+	$(INSTALL_DATA) $(srcdir)/scribuscopyright.html $(prefix)/share/doc/scribus-$(VERSION)/de/scribuscopyright.html
+	$(INSTALL_DATA) $(srcdir)/scribusfileformat.html $(prefix)/share/doc/scribus-$(VERSION)/de/scribusfileformat.html
+	$(INSTALL_DATA) $(srcdir)/scribus-svg.html $(prefix)/share/doc/scribus-$(VERSION)/de/scribus-svg.html
+	$(INSTALL_DATA) $(srcdir)/scripter1.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripter1.html
+	$(INSTALL_DATA) $(srcdir)/scripter-extensions.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripter-extensions.html
+	$(INSTALL_DATA) $(srcdir)/scripter-faq.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripter-faq.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-color.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-color.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-constants.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-constants.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-dialogs.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-dialogs.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-doc.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-doc.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-font.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-font.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-getobjprop.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-getobjprop.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-layer.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-layer.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-manobj.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-manobj.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-object.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-object.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-page.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-page.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-select.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-select.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-setobjprop.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-setobjprop.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-textframes.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-textframes.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-PDFfile.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-PDFfile.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-Printer.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-Printer.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-ImageExport.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-ImageExport.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-pydoc.html $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-pydoc.html
+	$(INSTALL_DATA) $(srcdir)/settings1.html $(prefix)/share/doc/scribus-$(VERSION)/de/settings1.html
+	$(INSTALL_DATA) $(srcdir)/specs.html $(prefix)/share/doc/scribus-$(VERSION)/de/specs.html
+	$(INSTALL_DATA) $(srcdir)/short-words.html $(prefix)/share/doc/scribus-$(VERSION)/de/short-words.html
+	$(INSTALL_DATA) $(srcdir)/toolbox10.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox10.html
+	$(INSTALL_DATA) $(srcdir)/toolbox11.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox11.html
+	$(INSTALL_DATA) $(srcdir)/toolbox12.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox12.html
+	$(INSTALL_DATA) $(srcdir)/toolbox13.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox13.html
+	$(INSTALL_DATA) $(srcdir)/toolbox1.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox1.html
+	$(INSTALL_DATA) $(srcdir)/toolbox2.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox2.html
+	$(INSTALL_DATA) $(srcdir)/toolbox3.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox3.html
+	$(INSTALL_DATA) $(srcdir)/toolbox4.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox4.html
+	$(INSTALL_DATA) $(srcdir)/toolbox5.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox5.html
+	$(INSTALL_DATA) $(srcdir)/toolbox6.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox6.html
+	$(INSTALL_DATA) $(srcdir)/toolbox7.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox7.html
+	$(INSTALL_DATA) $(srcdir)/toolbox8.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox8.html
+	$(INSTALL_DATA) $(srcdir)/toolbox9.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox9.html
+	$(INSTALL_DATA) $(srcdir)/toolbox.html $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox.html
+	$(INSTALL_DATA) $(srcdir)/topten.html $(prefix)/share/doc/scribus-$(VERSION)/de/topten.html
+	$(INSTALL_DATA) $(srcdir)/translation_howto.html $(prefix)/share/doc/scribus-$(VERSION)/de/translation_howto.html
+	$(INSTALL_DATA) $(srcdir)/pdf_form.html $(prefix)/share/doc/scribus-$(VERSION)/de/pdf_form.html
+	$(INSTALL_DATA) $(srcdir)/otherinfo.html $(prefix)/share/doc/scribus-$(VERSION)/de/otherinfo.html
+	$(INSTALL_DATA) $(srcdir)/documentation.html $(prefix)/share/doc/scribus-$(VERSION)/de/documentation.html
+	$(INSTALL_DATA) $(srcdir)/tutorials.html $(prefix)/share/doc/scribus-$(VERSION)/de/tutorials.html
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/de/about1.html
-	-rm -f $(prefix)/share/scribus/doc/de/about2.html
-	-rm -f $(prefix)/share/scribus/doc/de/cms.html
-	-rm -f $(prefix)/share/scribus/doc/de/cms2.html
-	-rm -f $(prefix)/share/scribus/doc/de/cms3.html
-	-rm -f $(prefix)/share/scribus/doc/de/cms4.html
-	-rm -f $(prefix)/share/scribus/doc/de/codingstandards.html
-	-rm -f $(prefix)/share/scribus/doc/de/contributions.html
-	-rm -f $(prefix)/share/scribus/doc/de/cross-platform.html
-	-rm -f $(prefix)/share/scribus/doc/de/cups.html
-	-rm -f $(prefix)/share/scribus/doc/de/developers.html
-	-rm -f $(prefix)/share/scribus/doc/de/doccopyright.html
-	-rm -f $(prefix)/share/scribus/doc/de/docinfo.html
-	-rm -f $(prefix)/share/scribus/doc/de/download.html
-	-rm -f $(prefix)/share/scribus/doc/de/install-dpkg.html
-	-rm -f $(prefix)/share/scribus/doc/de/faq1.html
-	-rm -f $(prefix)/share/scribus/doc/de/faq2.html
-	-rm -f $(prefix)/share/scribus/doc/de/faq3.html
-	-rm -f $(prefix)/share/scribus/doc/de/fonts1.html
-	-rm -f $(prefix)/share/scribus/doc/de/fonts2.html
-	-rm -f $(prefix)/share/scribus/doc/de/fonts3.html
-	-rm -f $(prefix)/share/scribus/doc/de/fonts4.html
-	-rm -f $(prefix)/share/scribus/doc/de/fonts5.html
-	-rm -f $(prefix)/share/scribus/doc/de/gettexthowto.html
-	-rm -f $(prefix)/share/scribus/doc/de/gsfont.html
-	-rm -f $(prefix)/share/scribus/doc/de/gsview.html
-	-rm -f $(prefix)/share/scribus/doc/de/hyphenator.html
-	-rm -f $(prefix)/share/scribus/doc/de/importhints.html
-	-rm -f $(prefix)/share/scribus/doc/de/importhints1.html
-	-rm -f $(prefix)/share/scribus/doc/de/importhints2.html
-	-rm -f $(prefix)/share/scribus/doc/de/importhints3.html
-	-rm -f $(prefix)/share/scribus/doc/de/index.html
-	-rm -f $(prefix)/share/scribus/doc/de/install1.html
-	-rm -f $(prefix)/share/scribus/doc/de/install2.html
-	-rm -f $(prefix)/share/scribus/doc/de/install3.html
-	-rm -f $(prefix)/share/scribus/doc/de/install.html
-	-rm -f $(prefix)/share/scribus/doc/de/intro.html
-	-rm -f $(prefix)/share/scribus/doc/de/irc.html
-	-rm -f $(prefix)/share/scribus/doc/de/javascriptpdf.html
-	-rm -f $(prefix)/share/scribus/doc/de/keys.html
-	-rm -f $(prefix)/share/scribus/doc/de/machints1.html
-	-rm -f $(prefix)/share/scribus/doc/de/machints2.html
-	-rm -f $(prefix)/share/scribus/doc/de/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/de/moncal.html
-	-rm -f $(prefix)/share/scribus/doc/de/mouse.html
-	-rm -f $(prefix)/share/scribus/doc/de/pagetemplate1.html
-	-rm -f $(prefix)/share/scribus/doc/de/parallel-install.html
-	-rm -f $(prefix)/share/scribus/doc/de/pdfexport1.html
-	-rm -f $(prefix)/share/scribus/doc/de/pdfexport2.html
-	-rm -f $(prefix)/share/scribus/doc/de/pdfexport3.html
-	-rm -f $(prefix)/share/scribus/doc/de/pdfexport4.html
-	-rm -f $(prefix)/share/scribus/doc/de/pdflavor.html
-	-rm -f $(prefix)/share/scribus/doc/de/pdfx3.html
-	-rm -f $(prefix)/share/scribus/doc/de/plugin_howto.html
-	-rm -f $(prefix)/share/scribus/doc/de/prepress.html
-	-rm -f $(prefix)/share/scribus/doc/de/print1.html
-	-rm -f $(prefix)/share/scribus/doc/de/print2.html
-	-rm -f $(prefix)/share/scribus/doc/de/print3.html
-	-rm -f $(prefix)/share/scribus/doc/de/readme.html
-	-rm -f $(prefix)/share/scribus/doc/de/resources.html
-	-rm -f $(prefix)/share/scribus/doc/de/scprinters.html
-	-rm -f $(prefix)/share/scribus/doc/de/scribuscopyright.html
-	-rm -f $(prefix)/share/scribus/doc/de/scribusfileformat.html
-	-rm -f $(prefix)/share/scribus/doc/de/scribus-svg.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripter1.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripter-extensions.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripter-faq.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-color.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-constants.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-dialogs.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-doc.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-font.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-getobjprop.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-layer.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-manobj.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-object.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-page.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-select.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-setobjprop.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-textframes.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-PDFfile.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-Printer.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-ImageExport.html
-	-rm -f $(prefix)/share/scribus/doc/de/scripterapi-pydoc.html
-	-rm -f $(prefix)/share/scribus/doc/de/settings1.html
-	-rm -f $(prefix)/share/scribus/doc/de/specs.html
-	-rm -f $(prefix)/share/scribus/doc/de/short-words.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox10.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox11.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox12.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox13.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox1.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox2.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox3.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox4.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox5.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox6.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox7.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox8.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox9.html
-	-rm -f $(prefix)/share/scribus/doc/de/toolbox.html
-	-rm -f $(prefix)/share/scribus/doc/de/topten.html
-	-rm -f $(prefix)/share/scribus/doc/de/translation_howto.html
-	-rm -f $(prefix)/share/scribus/doc/de/pdf_form.html
-	-rm -f $(prefix)/share/scribus/doc/de/otherinfo.html
-	-rm -f $(prefix)/share/scribus/doc/de/documentation.html
-	-rm -f $(prefix)/share/scribus/doc/de/tutorials.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/about1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/about2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/cms.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/cms2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/cms3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/cms4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/codingstandards.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/contributions.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/cross-platform.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/cups.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/developers.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/doccopyright.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/docinfo.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/download.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/install-dpkg.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/faq1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/faq2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/faq3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/fonts1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/fonts2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/fonts3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/fonts4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/fonts5.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/gettexthowto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/gsfont.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/gsview.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/hyphenator.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/importhints.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/importhints1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/importhints2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/importhints3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/index.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/install1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/install2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/install3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/install.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/intro.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/irc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/javascriptpdf.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/keys.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/machints1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/machints2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/moncal.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/mouse.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/pagetemplate1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/parallel-install.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/pdfexport1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/pdfexport2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/pdfexport3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/pdfexport4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/pdflavor.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/pdfx3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/plugin_howto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/prepress.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/print1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/print2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/print3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/readme.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/resources.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scprinters.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scribuscopyright.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scribusfileformat.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scribus-svg.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripter1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripter-extensions.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripter-faq.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-color.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-constants.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-dialogs.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-doc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-font.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-getobjprop.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-layer.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-manobj.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-object.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-page.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-select.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-setobjprop.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-textframes.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-PDFfile.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-Printer.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-ImageExport.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/scripterapi-pydoc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/settings1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/specs.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/short-words.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox10.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox11.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox12.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox13.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox5.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox6.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox7.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox8.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox9.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/toolbox.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/topten.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/translation_howto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/pdf_form.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/otherinfo.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/documentation.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/de/tutorials.html
 
diff -Naur Scribus/scribus/doc/en/images/Makefile.am Scribus-fhs/scribus/doc/en/images/Makefile.am
--- Scribus/scribus/doc/en/images/Makefile.am	2006-01-08 20:53:54.000000000 +0100
+++ Scribus-fhs/scribus/doc/en/images/Makefile.am	2006-03-27 00:12:59.976609000 +0200
@@ -2,195 +2,195 @@
 
 install-data-local:
 
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/scribus/doc/en/images/
-	$(INSTALL_DATA) $(srcdir)/acropass.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acropass.png
-	$(INSTALL_DATA) $(srcdir)/acroinfo.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acroinfo.png
-	$(INSTALL_DATA) $(srcdir)/acrosec.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acrosec.png
-	$(INSTALL_DATA) $(srcdir)/acro1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro1.png
-	$(INSTALL_DATA) $(srcdir)/acro2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro2.png
-	$(INSTALL_DATA) $(srcdir)/acro3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro3.png
-	$(INSTALL_DATA) $(srcdir)/acroreader5.1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acroreader5.1.png
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/after_short_words.png
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/before_short_words.png
-	$(INSTALL_DATA) $(srcdir)/batik1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/batik1.png
-	$(INSTALL_DATA) $(srcdir)/cmspanel.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmspanel.png
-	$(INSTALL_DATA) $(srcdir)/cmsmodify1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmsmodify1.png
-	$(INSTALL_DATA) $(srcdir)/colormgmtscreen.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormgmtscreen.png
-	$(INSTALL_DATA) $(srcdir)/colormanager2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormanager2.png
-	$(INSTALL_DATA) $(srcdir)/cups1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cups1.png
-	$(INSTALL_DATA) $(srcdir)/cups2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cups2.png
-	$(INSTALL_DATA) $(srcdir)/docinfo.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docinfo.png
-	$(INSTALL_DATA) $(srcdir)/docinfo2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docinfo2.png
-	$(INSTALL_DATA) $(srcdir)/docheader1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docheader1.png
-	$(INSTALL_DATA) $(srcdir)/docheader2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docheader2.png
-	$(INSTALL_DATA) $(srcdir)/filepicker.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/filepicker.png
-	$(INSTALL_DATA) $(srcdir)/fontpref1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref1.png
-	$(INSTALL_DATA) $(srcdir)/fontpref2.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref2.png 
-	$(INSTALL_DATA) $(srcdir)/fontpref3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref3.png
-	$(INSTALL_DATA) $(srcdir)/fonts.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts.png 
-	$(INSTALL_DATA) $(srcdir)/fonts2.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts2.png 
-	$(INSTALL_DATA) $(srcdir)/fonts3.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts3.png 
-	$(INSTALL_DATA) $(srcdir)/fonts4.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts4.png 
-	$(INSTALL_DATA) $(srcdir)/fontprev.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontprev.png
-	$(INSTALL_DATA) $(srcdir)/fontsampler.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontsampler.png
-	$(INSTALL_DATA) $(srcdir)/fontsampler2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontsampler2.png
-	$(INSTALL_DATA) $(srcdir)/gammagrayscale.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gammagrayscale.png
-	$(INSTALL_DATA) $(srcdir)/gimpoptions1.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions1.png 
-	$(INSTALL_DATA) $(srcdir)/gimpoptions2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions2.png
-	$(INSTALL_DATA) $(srcdir)/gimpoptions3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions3.png
-	$(INSTALL_DATA) $(srcdir)/gsadv1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv1.png
-	$(INSTALL_DATA) $(srcdir)/gsadv2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv2.png
-	$(INSTALL_DATA) $(srcdir)/gsadv3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv3.png
-	$(INSTALL_DATA) $(srcdir)/htmlimport.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/htmlimport.png
-	$(INSTALL_DATA) $(srcdir)/htmlstyle.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/htmlstyle.png
-	$(INSTALL_DATA) $(srcdir)/hyphen1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen1.png
-	$(INSTALL_DATA) $(srcdir)/hyphen2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen2.png
-	$(INSTALL_DATA) $(srcdir)/hyphen3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen3.png
-	$(INSTALL_DATA) $(srcdir)/inkscape.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/inkscape.png
-	$(INSTALL_DATA) $(srcdir)/kfontinstaller.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/kfontinstaller.png
-	$(INSTALL_DATA) $(srcdir)/kfontinstaller2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/kfontinstaller2.png
-	$(INSTALL_DATA) $(srcdir)/ksnapshot.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ksnapshot.png
-	$(INSTALL_DATA) $(srcdir)/monprof1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof1.png
-	$(INSTALL_DATA) $(srcdir)/monprof2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof2.png
-	$(INSTALL_DATA) $(srcdir)/monprof3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof3.png
-	$(INSTALL_DATA) $(srcdir)/monprof4.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof4.png
-	$(INSTALL_DATA) $(srcdir)/ooeps1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ooeps1.png
-	$(INSTALL_DATA) $(srcdir)/oochart.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/oochart.png
-	$(INSTALL_DATA) $(srcdir)/oogettext1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/oogettext1.png
-	$(INSTALL_DATA) $(srcdir)/pagetemplate1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pagetemplate1.png
-	$(INSTALL_DATA) $(srcdir)/pdfxcolor.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfxcolor.png
-	$(INSTALL_DATA) $(srcdir)/pdfxintent.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfxintent.png
-	$(INSTALL_DATA) $(srcdir)/pstoedit1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pstoedit1.png
-	$(INSTALL_DATA) $(srcdir)/pdfx3-1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfx3-1.png 
-	$(INSTALL_DATA) $(srcdir)/prefsblgrid1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefsblgrid1.png
-	$(INSTALL_DATA) $(srcdir)/prefsguides.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefsguides.png
-	$(INSTALL_DATA) $(srcdir)/prefspanel1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel1.png 
-	$(INSTALL_DATA) $(srcdir)/prefspanel2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel2.png
-	$(INSTALL_DATA) $(srcdir)/prefspanel3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel3.png
-	$(INSTALL_DATA) $(srcdir)/prefspanel4.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel4.png
-	$(INSTALL_DATA) $(srcdir)/prefspanel5.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel5.png
-	$(INSTALL_DATA) $(srcdir)/RDF.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/RDF.png
-	$(INSTALL_DATA) $(srcdir)/printer1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printer1.png
-	$(INSTALL_DATA) $(srcdir)/printer2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printer2.png
-	$(INSTALL_DATA) $(srcdir)/printseps.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printseps.png
-	$(INSTALL_DATA) $(srcdir)/printpreview.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printpreview.png
-	$(INSTALL_DATA) $(srcdir)/result.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/result.png
-	$(INSTALL_DATA) $(srcdir)/Scripter_error_string.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/Scripter_error_string.png
-	$(INSTALL_DATA) $(srcdir)/Scripter.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/Scripter.png
-	$(INSTALL_DATA) $(srcdir)/scripterprefs.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scripterprefs.png
-	$(INSTALL_DATA) $(srcdir)/scribus2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribus2.png
-	$(INSTALL_DATA) $(srcdir)/scribuscms1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribuscms1.png
-	$(INSTALL_DATA) $(srcdir)/scribustru4.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribustru4.png
-	$(INSTALL_DATA) $(srcdir)/spinbox1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/spinbox1.png
-	$(INSTALL_DATA) $(srcdir)/swmenu.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/swmenu.png
-	$(INSTALL_DATA) $(srcdir)/swdialog.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/swdialog.png
-	$(INSTALL_DATA) $(srcdir)/svg1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/svg1.png
-	$(INSTALL_DATA) $(srcdir)/xnview.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/xnview.png
-	$(INSTALL_DATA) $(srcdir)/formularz_export_PDF.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_export_PDF.png
-	$(INSTALL_DATA) $(srcdir)/formularz_js_skrypt.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_js_skrypt.png
-	$(INSTALL_DATA) $(srcdir)/formularz_js_sprawdzanie.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_js_sprawdzanie.png
-	$(INSTALL_DATA) $(srcdir)/formularz_nowy.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_nowy.png
-	$(INSTALL_DATA) $(srcdir)/formularz_pole_num.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_pole_num.png
-	$(INSTALL_DATA) $(srcdir)/siatka_jednostki_miar.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/siatka_jednostki_miar.png
-	$(INSTALL_DATA) $(srcdir)/siatka_menu.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/siatka_menu.png
-	$(INSTALL_DATA) $(srcdir)/symbole.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/symbole.png
-	$(INSTALL_DATA) $(srcdir)/ulica.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ulica.png
-	$(INSTALL_DATA) $(srcdir)/wlasciwosci_pola.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/wlasciwosci_pola.png
-	$(INSTALL_DATA) $(srcdir)/wyslij_formularz.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/wyslij_formularz.png
+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/
+	$(INSTALL_DATA) $(srcdir)/acropass.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acropass.png
+	$(INSTALL_DATA) $(srcdir)/acroinfo.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acroinfo.png
+	$(INSTALL_DATA) $(srcdir)/acrosec.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acrosec.png
+	$(INSTALL_DATA) $(srcdir)/acro1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro1.png
+	$(INSTALL_DATA) $(srcdir)/acro2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro2.png
+	$(INSTALL_DATA) $(srcdir)/acro3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro3.png
+	$(INSTALL_DATA) $(srcdir)/acroreader5.1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acroreader5.1.png
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/after_short_words.png
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/before_short_words.png
+	$(INSTALL_DATA) $(srcdir)/batik1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/batik1.png
+	$(INSTALL_DATA) $(srcdir)/cmspanel.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmspanel.png
+	$(INSTALL_DATA) $(srcdir)/cmsmodify1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmsmodify1.png
+	$(INSTALL_DATA) $(srcdir)/colormgmtscreen.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormgmtscreen.png
+	$(INSTALL_DATA) $(srcdir)/colormanager2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormanager2.png
+	$(INSTALL_DATA) $(srcdir)/cups1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cups1.png
+	$(INSTALL_DATA) $(srcdir)/cups2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cups2.png
+	$(INSTALL_DATA) $(srcdir)/docinfo.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docinfo.png
+	$(INSTALL_DATA) $(srcdir)/docinfo2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docinfo2.png
+	$(INSTALL_DATA) $(srcdir)/docheader1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docheader1.png
+	$(INSTALL_DATA) $(srcdir)/docheader2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docheader2.png
+	$(INSTALL_DATA) $(srcdir)/filepicker.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/filepicker.png
+	$(INSTALL_DATA) $(srcdir)/fontpref1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref1.png
+	$(INSTALL_DATA) $(srcdir)/fontpref2.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref2.png 
+	$(INSTALL_DATA) $(srcdir)/fontpref3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref3.png
+	$(INSTALL_DATA) $(srcdir)/fonts.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts.png 
+	$(INSTALL_DATA) $(srcdir)/fonts2.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts2.png 
+	$(INSTALL_DATA) $(srcdir)/fonts3.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts3.png 
+	$(INSTALL_DATA) $(srcdir)/fonts4.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts4.png 
+	$(INSTALL_DATA) $(srcdir)/fontprev.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontprev.png
+	$(INSTALL_DATA) $(srcdir)/fontsampler.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontsampler.png
+	$(INSTALL_DATA) $(srcdir)/fontsampler2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontsampler2.png
+	$(INSTALL_DATA) $(srcdir)/gammagrayscale.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gammagrayscale.png
+	$(INSTALL_DATA) $(srcdir)/gimpoptions1.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions1.png 
+	$(INSTALL_DATA) $(srcdir)/gimpoptions2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions2.png
+	$(INSTALL_DATA) $(srcdir)/gimpoptions3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions3.png
+	$(INSTALL_DATA) $(srcdir)/gsadv1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv1.png
+	$(INSTALL_DATA) $(srcdir)/gsadv2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv2.png
+	$(INSTALL_DATA) $(srcdir)/gsadv3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv3.png
+	$(INSTALL_DATA) $(srcdir)/htmlimport.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/htmlimport.png
+	$(INSTALL_DATA) $(srcdir)/htmlstyle.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/htmlstyle.png
+	$(INSTALL_DATA) $(srcdir)/hyphen1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen1.png
+	$(INSTALL_DATA) $(srcdir)/hyphen2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen2.png
+	$(INSTALL_DATA) $(srcdir)/hyphen3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen3.png
+	$(INSTALL_DATA) $(srcdir)/inkscape.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/inkscape.png
+	$(INSTALL_DATA) $(srcdir)/kfontinstaller.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/kfontinstaller.png
+	$(INSTALL_DATA) $(srcdir)/kfontinstaller2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/kfontinstaller2.png
+	$(INSTALL_DATA) $(srcdir)/ksnapshot.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ksnapshot.png
+	$(INSTALL_DATA) $(srcdir)/monprof1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof1.png
+	$(INSTALL_DATA) $(srcdir)/monprof2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof2.png
+	$(INSTALL_DATA) $(srcdir)/monprof3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof3.png
+	$(INSTALL_DATA) $(srcdir)/monprof4.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof4.png
+	$(INSTALL_DATA) $(srcdir)/ooeps1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ooeps1.png
+	$(INSTALL_DATA) $(srcdir)/oochart.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/oochart.png
+	$(INSTALL_DATA) $(srcdir)/oogettext1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/oogettext1.png
+	$(INSTALL_DATA) $(srcdir)/pagetemplate1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pagetemplate1.png
+	$(INSTALL_DATA) $(srcdir)/pdfxcolor.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfxcolor.png
+	$(INSTALL_DATA) $(srcdir)/pdfxintent.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfxintent.png
+	$(INSTALL_DATA) $(srcdir)/pstoedit1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pstoedit1.png
+	$(INSTALL_DATA) $(srcdir)/pdfx3-1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfx3-1.png 
+	$(INSTALL_DATA) $(srcdir)/prefsblgrid1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefsblgrid1.png
+	$(INSTALL_DATA) $(srcdir)/prefsguides.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefsguides.png
+	$(INSTALL_DATA) $(srcdir)/prefspanel1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel1.png 
+	$(INSTALL_DATA) $(srcdir)/prefspanel2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel2.png
+	$(INSTALL_DATA) $(srcdir)/prefspanel3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel3.png
+	$(INSTALL_DATA) $(srcdir)/prefspanel4.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel4.png
+	$(INSTALL_DATA) $(srcdir)/prefspanel5.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel5.png
+	$(INSTALL_DATA) $(srcdir)/RDF.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/RDF.png
+	$(INSTALL_DATA) $(srcdir)/printer1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printer1.png
+	$(INSTALL_DATA) $(srcdir)/printer2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printer2.png
+	$(INSTALL_DATA) $(srcdir)/printseps.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printseps.png
+	$(INSTALL_DATA) $(srcdir)/printpreview.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printpreview.png
+	$(INSTALL_DATA) $(srcdir)/result.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/result.png
+	$(INSTALL_DATA) $(srcdir)/Scripter_error_string.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/Scripter_error_string.png
+	$(INSTALL_DATA) $(srcdir)/Scripter.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/Scripter.png
+	$(INSTALL_DATA) $(srcdir)/scripterprefs.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scripterprefs.png
+	$(INSTALL_DATA) $(srcdir)/scribus2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribus2.png
+	$(INSTALL_DATA) $(srcdir)/scribuscms1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribuscms1.png
+	$(INSTALL_DATA) $(srcdir)/scribustru4.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribustru4.png
+	$(INSTALL_DATA) $(srcdir)/spinbox1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/spinbox1.png
+	$(INSTALL_DATA) $(srcdir)/swmenu.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/swmenu.png
+	$(INSTALL_DATA) $(srcdir)/swdialog.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/swdialog.png
+	$(INSTALL_DATA) $(srcdir)/svg1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/svg1.png
+	$(INSTALL_DATA) $(srcdir)/xnview.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/xnview.png
+	$(INSTALL_DATA) $(srcdir)/formularz_export_PDF.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_export_PDF.png
+	$(INSTALL_DATA) $(srcdir)/formularz_js_skrypt.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_js_skrypt.png
+	$(INSTALL_DATA) $(srcdir)/formularz_js_sprawdzanie.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_js_sprawdzanie.png
+	$(INSTALL_DATA) $(srcdir)/formularz_nowy.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_nowy.png
+	$(INSTALL_DATA) $(srcdir)/formularz_pole_num.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_pole_num.png
+	$(INSTALL_DATA) $(srcdir)/siatka_jednostki_miar.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/siatka_jednostki_miar.png
+	$(INSTALL_DATA) $(srcdir)/siatka_menu.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/siatka_menu.png
+	$(INSTALL_DATA) $(srcdir)/symbole.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/symbole.png
+	$(INSTALL_DATA) $(srcdir)/ulica.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ulica.png
+	$(INSTALL_DATA) $(srcdir)/wlasciwosci_pola.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/wlasciwosci_pola.png
+	$(INSTALL_DATA) $(srcdir)/wyslij_formularz.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/wyslij_formularz.png
 
 uninstall-local:
 
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acroreader5.1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acroinfo.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acropass.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/after_short_words.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/before_short_words.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acrosec.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/batik1.png	
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmsmodify1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmspanel.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormanager2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormgmtscreen.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cups1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cups2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmspanel.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormanager2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docheader1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docheader2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docinfo.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docinfo2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/filepicker.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontprev.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts4.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref1.png 
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontprev.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontsampler.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontsampler2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gammagrayscale.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/inkscape.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/kfontinstaller.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/kfontinstaller2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ksnapshot.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ooeps1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/oochart.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/oogettext1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pagetemplate1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfxcolor.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfxintent.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefsblgrid1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefsguides.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel4.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefspanel5.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printer1.png 
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printer2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printpreview.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printseps.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pstoedit1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfx3-1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/result.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/RDF.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/spinbox1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/Scripter.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scripterprefs.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/Scripter_error_string.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribus2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribustru4.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/svg1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribuscms1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/swdialog.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/swmenu.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/xnview.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_export_PDF.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_js_skrypt.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_js_sprawdzanie.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_nowy.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_pole_num.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/siatka_jednostki_miar.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/siatka_menu.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/symbole.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ulica.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/wlasciwosci_pola.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/wyslij_formularz.png
\ Kein Zeilenumbruch am Dateiende.
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acroreader5.1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acroinfo.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acropass.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/after_short_words.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/before_short_words.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acrosec.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/batik1.png	
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmsmodify1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmspanel.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormanager2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormgmtscreen.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cups1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cups2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmspanel.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormanager2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docheader1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docheader2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docinfo.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docinfo2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/filepicker.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontprev.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts4.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref1.png 
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontprev.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontsampler.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontsampler2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gammagrayscale.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/inkscape.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/kfontinstaller.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/kfontinstaller2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ksnapshot.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ooeps1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/oochart.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/oogettext1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pagetemplate1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfxcolor.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfxintent.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefsblgrid1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefsguides.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel4.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefspanel5.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printer1.png 
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printer2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printpreview.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printseps.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pstoedit1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfx3-1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/result.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/RDF.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/spinbox1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/Scripter.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scripterprefs.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/Scripter_error_string.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribus2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribustru4.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/svg1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribuscms1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/swdialog.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/swmenu.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/xnview.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_export_PDF.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_js_skrypt.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_js_sprawdzanie.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_nowy.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_pole_num.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/siatka_jednostki_miar.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/siatka_menu.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/symbole.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ulica.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/wlasciwosci_pola.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/wyslij_formularz.png
\ Kein Zeilenumbruch am Dateiende.
diff -Naur Scribus/scribus/doc/en/Makefile.am Scribus-fhs/scribus/doc/en/Makefile.am
--- Scribus/scribus/doc/en/Makefile.am	2006-01-17 22:08:49.000000000 +0100
+++ Scribus-fhs/scribus/doc/en/Makefile.am	2006-03-27 00:12:59.972608750 +0200
@@ -3,224 +3,224 @@
 EXTRA_DIST = about1.html about2.html cms.html cms2.html cms3.html cms4.html codingstandards.html contributions.html cross-platform.html cups.html  developers.html  doccopyright.html docinfo.html download.html faq1.html faq2.html faq3.html fonts1.html fonts2.html fonts3.html fonts4.html fonts5.html gettexthowto.html gsfont.html hyphenator.html  importhints2.html importhints.html importhints3.html importhints4.html index.html irc.html install1.html install2.html install3.html install.html install-dpkg.html intro.html javascriptpdf.html keys.html machints1.html machints2.html menu.xml moncal.html mouse.html pagetemplate1.html parallel-install.html pdfexport1.html pdfexport2.html pdfexport3.html pdfexport4.html pdflavor.html pdfx3.html pdf_form.html plugin_howto.html prepress.html print1.html print2.html print3.html  readme.html resources.html scprinters.html scribuscopyright.html scribusfileformat.html scribus-svg.html scripter1.html scripter-extensions.html scripterapi-color.html scripterapi-constants.html scripterapi-dialogs.html scripterapi-doc.html scripterapi-font.html scripterapi-getobjprop.html scripterapi.html scripterapi-layer.html scripterapi-manobj.html scripterapi-object.html scripterapi-page.html scripterapi-select.html scripterapi-setobjprop.html scripterapi-textframes.html scripter-faq.html scripterapi-pydoc.html scripterapi-PDFfile.html scripterapi-Printer.html scripterapi-ImageExport.html settings1.html specs.html  short-words.html toolbox10.html toolbox11.html toolbox12.html toolbox13.html toolbox1.html toolbox2.html toolbox3.html toolbox4.html toolbox5.html toolbox6.html toolbox7.html toolbox8.html toolbox9.html toolbox.html topten.html translation_howto.html  otherinfo.html documentation.html tutorials.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/
-	$(INSTALL_DATA) $(srcdir)/about1.html $(prefix)/share/scribus/doc/en/about1.html
-	$(INSTALL_DATA) $(srcdir)/about2.html $(prefix)/share/scribus/doc/en/about2.html
-	$(INSTALL_DATA) $(srcdir)/cms.html $(prefix)/share/scribus/doc/en/cms.html
-	$(INSTALL_DATA) $(srcdir)/cms2.html $(prefix)/share/scribus/doc/en/cms2.html
-	$(INSTALL_DATA) $(srcdir)/cms3.html $(prefix)/share/scribus/doc/en/cms3.html
-	$(INSTALL_DATA) $(srcdir)/cms4.html $(prefix)/share/scribus/doc/en/cms4.html
-	$(INSTALL_DATA) $(srcdir)/codingstandards.html $(prefix)/share/scribus/doc/en/codingstandards.html
-	$(INSTALL_DATA) $(srcdir)/contributions.html $(prefix)/share/scribus/doc/en/contributions.html
-	$(INSTALL_DATA) $(srcdir)/cross-platform.html $(prefix)/share/scribus/doc/en/cross-platform.html
-	$(INSTALL_DATA) $(srcdir)/cups.html $(prefix)/share/scribus/doc/en/cups.html
-	$(INSTALL_DATA) $(srcdir)/developers.html $(prefix)/share/scribus/doc/en/developers.html
-	$(INSTALL_DATA) $(srcdir)/doccopyright.html $(prefix)/share/scribus/doc/en/doccopyright.html
-	$(INSTALL_DATA) $(srcdir)/docinfo.html $(prefix)/share/scribus/doc/en/docinfo.html
-	$(INSTALL_DATA) $(srcdir)/download.html $(prefix)/share/scribus/doc/en/download.html
-	$(INSTALL_DATA) $(srcdir)/faq1.html $(prefix)/share/scribus/doc/en/faq1.html
-	$(INSTALL_DATA) $(srcdir)/faq2.html $(prefix)/share/scribus/doc/en/faq2.html
-	$(INSTALL_DATA) $(srcdir)/faq3.html $(prefix)/share/scribus/doc/en/faq3.html
-	$(INSTALL_DATA) $(srcdir)/fonts1.html $(prefix)/share/scribus/doc/en/fonts1.html
-	$(INSTALL_DATA) $(srcdir)/fonts2.html $(prefix)/share/scribus/doc/en/fonts2.html
-	$(INSTALL_DATA) $(srcdir)/fonts3.html $(prefix)/share/scribus/doc/en/fonts3.html
-	$(INSTALL_DATA) $(srcdir)/fonts4.html $(prefix)/share/scribus/doc/en/fonts4.html
-	$(INSTALL_DATA) $(srcdir)/fonts5.html $(prefix)/share/scribus/doc/en/fonts5.html
-	$(INSTALL_DATA) $(srcdir)/gettexthowto.html $(prefix)/share/scribus/doc/en/gettexthowto.html
-	$(INSTALL_DATA) $(srcdir)/gsfont.html $(prefix)/share/scribus/doc/en/gsfont.html
-	$(INSTALL_DATA) $(srcdir)/hyphenator.html $(prefix)/share/scribus/doc/en/hyphenator.html
-	$(INSTALL_DATA) $(srcdir)/importhints.html $(prefix)/share/scribus/doc/en/importhints.html
-	$(INSTALL_DATA) $(srcdir)/importhints1.html $(prefix)/share/scribus/doc/en/importhints1.html
-	$(INSTALL_DATA) $(srcdir)/importhints2.html $(prefix)/share/scribus/doc/en/importhints2.html
-	$(INSTALL_DATA) $(srcdir)/importhints3.html $(prefix)/share/scribus/doc/en/importhints3.html
-	$(INSTALL_DATA) $(srcdir)/importhints4.html $(prefix)/share/scribus/doc/en/importhints4.html
-	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/share/scribus/doc/en/index.html
-	$(INSTALL_DATA) $(srcdir)/install1.html $(prefix)/share/scribus/doc/en/install1.html
-	$(INSTALL_DATA) $(srcdir)/install2.html $(prefix)/share/scribus/doc/en/install2.html
-	$(INSTALL_DATA) $(srcdir)/install3.html $(prefix)/share/scribus/doc/en/install3.html
-	$(INSTALL_DATA) $(srcdir)/install.html $(prefix)/share/scribus/doc/en/install.html
-	$(INSTALL_DATA) $(srcdir)/install-dpkg.html $(prefix)/share/scribus/doc/en/install-dpkg.html
-	$(INSTALL_DATA) $(srcdir)/intro.html $(prefix)/share/scribus/doc/en/intro.html
-	$(INSTALL_DATA) $(srcdir)/irc.html $(prefix)/share/scribus/doc/en/irc.html
-	$(INSTALL_DATA) $(srcdir)/javascriptpdf.html $(prefix)/share/scribus/doc/en/javascriptpdf.html
-	$(INSTALL_DATA) $(srcdir)/keys.html $(prefix)/share/scribus/doc/en/keys.html
-	$(INSTALL_DATA) $(srcdir)/machints1.html $(prefix)/share/scribus/doc/en/machints1.html
-	$(INSTALL_DATA) $(srcdir)/machints2.html $(prefix)/share/scribus/doc/en/machints2.html
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/en/menu.xml
-	$(INSTALL_DATA) $(srcdir)/moncal.html $(prefix)/share/scribus/doc/en/moncal.html
-	$(INSTALL_DATA) $(srcdir)/mouse.html $(prefix)/share/scribus/doc/en/mouse.html
-	$(INSTALL_DATA) $(srcdir)/pagetemplate1.html $(DESTDIR)$(prefix)/share/scribus/doc/en/pagetemplate1.html
-	$(INSTALL_DATA) $(srcdir)/parallel-install.html $(prefix)/share/scribus/doc/en/parallel-install.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport1.html $(prefix)/share/scribus/doc/en/pdfexport1.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport2.html $(prefix)/share/scribus/doc/en/pdfexport2.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport3.html $(prefix)/share/scribus/doc/en/pdfexport3.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport4.html $(prefix)/share/scribus/doc/en/pdfexport4.html
-	$(INSTALL_DATA) $(srcdir)/pdflavor.html $(prefix)/share/scribus/doc/en/pdflavor.html
-	$(INSTALL_DATA) $(srcdir)/pdfx3.html $(prefix)/share/scribus/doc/en/pdfx3.html
-	$(INSTALL_DATA) $(srcdir)/plugin_howto.html $(prefix)/share/scribus/doc/en/plugin_howto.html
-	$(INSTALL_DATA) $(srcdir)/prepress.html $(prefix)/share/scribus/doc/en/prepress.html
-	$(INSTALL_DATA) $(srcdir)/print1.html $(prefix)/share/scribus/doc/en/print1.html
-	$(INSTALL_DATA) $(srcdir)/print2.html $(prefix)/share/scribus/doc/en/print2.html
-	$(INSTALL_DATA) $(srcdir)/print3.html $(prefix)/share/scribus/doc/en/print3.html
-	$(INSTALL_DATA) $(srcdir)/readme.html $(prefix)/share/scribus/doc/en/readme.html
-	$(INSTALL_DATA) $(srcdir)/resources.html $(prefix)/share/scribus/doc/en/resources.html
-	$(INSTALL_DATA) $(srcdir)/scprinters.html $(prefix)/share/scribus/doc/en/scprinters.html
-	$(INSTALL_DATA) $(srcdir)/scribuscopyright.html $(prefix)/share/scribus/doc/en/scribuscopyright.html
-	$(INSTALL_DATA) $(srcdir)/scribusfileformat.html $(prefix)/share/scribus/doc/en/scribusfileformat.html
-	$(INSTALL_DATA) $(srcdir)/scribus-svg.html $(prefix)/share/scribus/doc/en/scribus-svg.html
-	$(INSTALL_DATA) $(srcdir)/scripter1.html $(prefix)/share/scribus/doc/en/scripter1.html
-	$(INSTALL_DATA) $(srcdir)/scripter-extensions.html $(prefix)/share/scribus/doc/en/scripter-extensions.html
-	$(INSTALL_DATA) $(srcdir)/scripter-faq.html $(prefix)/share/scribus/doc/en/scripter-faq.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-color.html $(prefix)/share/scribus/doc/en/scripterapi-color.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-constants.html $(prefix)/share/scribus/doc/en/scripterapi-constants.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-dialogs.html $(prefix)/share/scribus/doc/en/scripterapi-dialogs.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-doc.html $(prefix)/share/scribus/doc/en/scripterapi-doc.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-font.html $(prefix)/share/scribus/doc/en/scripterapi-font.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-getobjprop.html $(prefix)/share/scribus/doc/en/scripterapi-getobjprop.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi.html $(prefix)/share/scribus/doc/en/scripterapi.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-layer.html $(prefix)/share/scribus/doc/en/scripterapi-layer.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-manobj.html $(prefix)/share/scribus/doc/en/scripterapi-manobj.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-object.html $(prefix)/share/scribus/doc/en/scripterapi-object.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-page.html $(prefix)/share/scribus/doc/en/scripterapi-page.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-select.html $(prefix)/share/scribus/doc/en/scripterapi-select.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-setobjprop.html $(prefix)/share/scribus/doc/en/scripterapi-setobjprop.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-textframes.html $(prefix)/share/scribus/doc/en/scripterapi-textframes.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-PDFfile.html $(prefix)/share/scribus/doc/en/scripterapi-PDFfile.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-Printer.html $(prefix)/share/scribus/doc/en/scripterapi-Printer.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-ImageExport.html $(prefix)/share/scribus/doc/en/scripterapi-ImageExport.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-pydoc.html $(prefix)/share/scribus/doc/en/scripterapi-pydoc.html
-	$(INSTALL_DATA) $(srcdir)/settings1.html $(prefix)/share/scribus/doc/en/settings1.html
-	$(INSTALL_DATA) $(srcdir)/specs.html $(prefix)/share/scribus/doc/en/specs.html
-	$(INSTALL_DATA) $(srcdir)/short-words.html $(prefix)/share/scribus/doc/en/short-words.html
-	$(INSTALL_DATA) $(srcdir)/toolbox10.html $(prefix)/share/scribus/doc/en/toolbox10.html
-	$(INSTALL_DATA) $(srcdir)/toolbox11.html $(prefix)/share/scribus/doc/en/toolbox11.html
-	$(INSTALL_DATA) $(srcdir)/toolbox12.html $(prefix)/share/scribus/doc/en/toolbox12.html
-	$(INSTALL_DATA) $(srcdir)/toolbox13.html $(prefix)/share/scribus/doc/en/toolbox13.html
-	$(INSTALL_DATA) $(srcdir)/toolbox1.html $(prefix)/share/scribus/doc/en/toolbox1.html
-	$(INSTALL_DATA) $(srcdir)/toolbox2.html $(prefix)/share/scribus/doc/en/toolbox2.html
-	$(INSTALL_DATA) $(srcdir)/toolbox3.html $(prefix)/share/scribus/doc/en/toolbox3.html
-	$(INSTALL_DATA) $(srcdir)/toolbox4.html $(prefix)/share/scribus/doc/en/toolbox4.html
-	$(INSTALL_DATA) $(srcdir)/toolbox5.html $(prefix)/share/scribus/doc/en/toolbox5.html
-	$(INSTALL_DATA) $(srcdir)/toolbox6.html $(prefix)/share/scribus/doc/en/toolbox6.html
-	$(INSTALL_DATA) $(srcdir)/toolbox7.html $(prefix)/share/scribus/doc/en/toolbox7.html
-	$(INSTALL_DATA) $(srcdir)/toolbox8.html $(prefix)/share/scribus/doc/en/toolbox8.html
-	$(INSTALL_DATA) $(srcdir)/toolbox9.html $(prefix)/share/scribus/doc/en/toolbox9.html
-	$(INSTALL_DATA) $(srcdir)/toolbox.html $(prefix)/share/scribus/doc/en/toolbox.html
-	$(INSTALL_DATA) $(srcdir)/topten.html $(prefix)/share/scribus/doc/en/topten.html
-	$(INSTALL_DATA) $(srcdir)/translation_howto.html $(prefix)/share/scribus/doc/en/translation_howto.html
-	$(INSTALL_DATA) $(srcdir)/pdf_form.html $(prefix)/share/scribus/doc/en/pdf_form.html
-	$(INSTALL_DATA) $(srcdir)/otherinfo.html $(prefix)/share/scribus/doc/en/otherinfo.html
-	$(INSTALL_DATA) $(srcdir)/documentation.html $(prefix)/share/scribus/doc/en/documentation.html
-	$(INSTALL_DATA) $(srcdir)/tutorials.html $(prefix)/share/scribus/doc/en/tutorials.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/
+	$(INSTALL_DATA) $(srcdir)/about1.html $(prefix)/share/doc/scribus-$(VERSION)/en/about1.html
+	$(INSTALL_DATA) $(srcdir)/about2.html $(prefix)/share/doc/scribus-$(VERSION)/en/about2.html
+	$(INSTALL_DATA) $(srcdir)/cms.html $(prefix)/share/doc/scribus-$(VERSION)/en/cms.html
+	$(INSTALL_DATA) $(srcdir)/cms2.html $(prefix)/share/doc/scribus-$(VERSION)/en/cms2.html
+	$(INSTALL_DATA) $(srcdir)/cms3.html $(prefix)/share/doc/scribus-$(VERSION)/en/cms3.html
+	$(INSTALL_DATA) $(srcdir)/cms4.html $(prefix)/share/doc/scribus-$(VERSION)/en/cms4.html
+	$(INSTALL_DATA) $(srcdir)/codingstandards.html $(prefix)/share/doc/scribus-$(VERSION)/en/codingstandards.html
+	$(INSTALL_DATA) $(srcdir)/contributions.html $(prefix)/share/doc/scribus-$(VERSION)/en/contributions.html
+	$(INSTALL_DATA) $(srcdir)/cross-platform.html $(prefix)/share/doc/scribus-$(VERSION)/en/cross-platform.html
+	$(INSTALL_DATA) $(srcdir)/cups.html $(prefix)/share/doc/scribus-$(VERSION)/en/cups.html
+	$(INSTALL_DATA) $(srcdir)/developers.html $(prefix)/share/doc/scribus-$(VERSION)/en/developers.html
+	$(INSTALL_DATA) $(srcdir)/doccopyright.html $(prefix)/share/doc/scribus-$(VERSION)/en/doccopyright.html
+	$(INSTALL_DATA) $(srcdir)/docinfo.html $(prefix)/share/doc/scribus-$(VERSION)/en/docinfo.html
+	$(INSTALL_DATA) $(srcdir)/download.html $(prefix)/share/doc/scribus-$(VERSION)/en/download.html
+	$(INSTALL_DATA) $(srcdir)/faq1.html $(prefix)/share/doc/scribus-$(VERSION)/en/faq1.html
+	$(INSTALL_DATA) $(srcdir)/faq2.html $(prefix)/share/doc/scribus-$(VERSION)/en/faq2.html
+	$(INSTALL_DATA) $(srcdir)/faq3.html $(prefix)/share/doc/scribus-$(VERSION)/en/faq3.html
+	$(INSTALL_DATA) $(srcdir)/fonts1.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts1.html
+	$(INSTALL_DATA) $(srcdir)/fonts2.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts2.html
+	$(INSTALL_DATA) $(srcdir)/fonts3.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts3.html
+	$(INSTALL_DATA) $(srcdir)/fonts4.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts4.html
+	$(INSTALL_DATA) $(srcdir)/fonts5.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts5.html
+	$(INSTALL_DATA) $(srcdir)/gettexthowto.html $(prefix)/share/doc/scribus-$(VERSION)/en/gettexthowto.html
+	$(INSTALL_DATA) $(srcdir)/gsfont.html $(prefix)/share/doc/scribus-$(VERSION)/en/gsfont.html
+	$(INSTALL_DATA) $(srcdir)/hyphenator.html $(prefix)/share/doc/scribus-$(VERSION)/en/hyphenator.html
+	$(INSTALL_DATA) $(srcdir)/importhints.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints.html
+	$(INSTALL_DATA) $(srcdir)/importhints1.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints1.html
+	$(INSTALL_DATA) $(srcdir)/importhints2.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints2.html
+	$(INSTALL_DATA) $(srcdir)/importhints3.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints3.html
+	$(INSTALL_DATA) $(srcdir)/importhints4.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints4.html
+	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/share/doc/scribus-$(VERSION)/en/index.html
+	$(INSTALL_DATA) $(srcdir)/install1.html $(prefix)/share/doc/scribus-$(VERSION)/en/install1.html
+	$(INSTALL_DATA) $(srcdir)/install2.html $(prefix)/share/doc/scribus-$(VERSION)/en/install2.html
+	$(INSTALL_DATA) $(srcdir)/install3.html $(prefix)/share/doc/scribus-$(VERSION)/en/install3.html
+	$(INSTALL_DATA) $(srcdir)/install.html $(prefix)/share/doc/scribus-$(VERSION)/en/install.html
+	$(INSTALL_DATA) $(srcdir)/install-dpkg.html $(prefix)/share/doc/scribus-$(VERSION)/en/install-dpkg.html
+	$(INSTALL_DATA) $(srcdir)/intro.html $(prefix)/share/doc/scribus-$(VERSION)/en/intro.html
+	$(INSTALL_DATA) $(srcdir)/irc.html $(prefix)/share/doc/scribus-$(VERSION)/en/irc.html
+	$(INSTALL_DATA) $(srcdir)/javascriptpdf.html $(prefix)/share/doc/scribus-$(VERSION)/en/javascriptpdf.html
+	$(INSTALL_DATA) $(srcdir)/keys.html $(prefix)/share/doc/scribus-$(VERSION)/en/keys.html
+	$(INSTALL_DATA) $(srcdir)/machints1.html $(prefix)/share/doc/scribus-$(VERSION)/en/machints1.html
+	$(INSTALL_DATA) $(srcdir)/machints2.html $(prefix)/share/doc/scribus-$(VERSION)/en/machints2.html
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/en/menu.xml
+	$(INSTALL_DATA) $(srcdir)/moncal.html $(prefix)/share/doc/scribus-$(VERSION)/en/moncal.html
+	$(INSTALL_DATA) $(srcdir)/mouse.html $(prefix)/share/doc/scribus-$(VERSION)/en/mouse.html
+	$(INSTALL_DATA) $(srcdir)/pagetemplate1.html $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/pagetemplate1.html
+	$(INSTALL_DATA) $(srcdir)/parallel-install.html $(prefix)/share/doc/scribus-$(VERSION)/en/parallel-install.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport1.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport1.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport2.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport2.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport3.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport3.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport4.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport4.html
+	$(INSTALL_DATA) $(srcdir)/pdflavor.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdflavor.html
+	$(INSTALL_DATA) $(srcdir)/pdfx3.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfx3.html
+	$(INSTALL_DATA) $(srcdir)/plugin_howto.html $(prefix)/share/doc/scribus-$(VERSION)/en/plugin_howto.html
+	$(INSTALL_DATA) $(srcdir)/prepress.html $(prefix)/share/doc/scribus-$(VERSION)/en/prepress.html
+	$(INSTALL_DATA) $(srcdir)/print1.html $(prefix)/share/doc/scribus-$(VERSION)/en/print1.html
+	$(INSTALL_DATA) $(srcdir)/print2.html $(prefix)/share/doc/scribus-$(VERSION)/en/print2.html
+	$(INSTALL_DATA) $(srcdir)/print3.html $(prefix)/share/doc/scribus-$(VERSION)/en/print3.html
+	$(INSTALL_DATA) $(srcdir)/readme.html $(prefix)/share/doc/scribus-$(VERSION)/en/readme.html
+	$(INSTALL_DATA) $(srcdir)/resources.html $(prefix)/share/doc/scribus-$(VERSION)/en/resources.html
+	$(INSTALL_DATA) $(srcdir)/scprinters.html $(prefix)/share/doc/scribus-$(VERSION)/en/scprinters.html
+	$(INSTALL_DATA) $(srcdir)/scribuscopyright.html $(prefix)/share/doc/scribus-$(VERSION)/en/scribuscopyright.html
+	$(INSTALL_DATA) $(srcdir)/scribusfileformat.html $(prefix)/share/doc/scribus-$(VERSION)/en/scribusfileformat.html
+	$(INSTALL_DATA) $(srcdir)/scribus-svg.html $(prefix)/share/doc/scribus-$(VERSION)/en/scribus-svg.html
+	$(INSTALL_DATA) $(srcdir)/scripter1.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripter1.html
+	$(INSTALL_DATA) $(srcdir)/scripter-extensions.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripter-extensions.html
+	$(INSTALL_DATA) $(srcdir)/scripter-faq.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripter-faq.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-color.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-color.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-constants.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-constants.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-dialogs.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-dialogs.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-doc.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-doc.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-font.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-font.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-getobjprop.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-getobjprop.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-layer.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-layer.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-manobj.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-manobj.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-object.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-object.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-page.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-page.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-select.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-select.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-setobjprop.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-setobjprop.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-textframes.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-textframes.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-PDFfile.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-PDFfile.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-Printer.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-Printer.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-ImageExport.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-ImageExport.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-pydoc.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-pydoc.html
+	$(INSTALL_DATA) $(srcdir)/settings1.html $(prefix)/share/doc/scribus-$(VERSION)/en/settings1.html
+	$(INSTALL_DATA) $(srcdir)/specs.html $(prefix)/share/doc/scribus-$(VERSION)/en/specs.html
+	$(INSTALL_DATA) $(srcdir)/short-words.html $(prefix)/share/doc/scribus-$(VERSION)/en/short-words.html
+	$(INSTALL_DATA) $(srcdir)/toolbox10.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox10.html
+	$(INSTALL_DATA) $(srcdir)/toolbox11.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox11.html
+	$(INSTALL_DATA) $(srcdir)/toolbox12.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox12.html
+	$(INSTALL_DATA) $(srcdir)/toolbox13.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox13.html
+	$(INSTALL_DATA) $(srcdir)/toolbox1.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox1.html
+	$(INSTALL_DATA) $(srcdir)/toolbox2.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox2.html
+	$(INSTALL_DATA) $(srcdir)/toolbox3.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox3.html
+	$(INSTALL_DATA) $(srcdir)/toolbox4.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox4.html
+	$(INSTALL_DATA) $(srcdir)/toolbox5.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox5.html
+	$(INSTALL_DATA) $(srcdir)/toolbox6.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox6.html
+	$(INSTALL_DATA) $(srcdir)/toolbox7.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox7.html
+	$(INSTALL_DATA) $(srcdir)/toolbox8.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox8.html
+	$(INSTALL_DATA) $(srcdir)/toolbox9.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox9.html
+	$(INSTALL_DATA) $(srcdir)/toolbox.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox.html
+	$(INSTALL_DATA) $(srcdir)/topten.html $(prefix)/share/doc/scribus-$(VERSION)/en/topten.html
+	$(INSTALL_DATA) $(srcdir)/translation_howto.html $(prefix)/share/doc/scribus-$(VERSION)/en/translation_howto.html
+	$(INSTALL_DATA) $(srcdir)/pdf_form.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdf_form.html
+	$(INSTALL_DATA) $(srcdir)/otherinfo.html $(prefix)/share/doc/scribus-$(VERSION)/en/otherinfo.html
+	$(INSTALL_DATA) $(srcdir)/documentation.html $(prefix)/share/doc/scribus-$(VERSION)/en/documentation.html
+	$(INSTALL_DATA) $(srcdir)/tutorials.html $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials.html
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/en/about1.html
-	-rm -f $(prefix)/share/scribus/doc/en/about2.html
-	-rm -f $(prefix)/share/scribus/doc/en/cms.html
-	-rm -f $(prefix)/share/scribus/doc/en/cms2.html
-	-rm -f $(prefix)/share/scribus/doc/en/cms3.html
-	-rm -f $(prefix)/share/scribus/doc/en/cms4.html
-	-rm -f $(prefix)/share/scribus/doc/en/codingstandards.html
-	-rm -f $(prefix)/share/scribus/doc/en/contributions.html
-	-rm -f $(prefix)/share/scribus/doc/en/cross-platform.html
-	-rm -f $(prefix)/share/scribus/doc/en/cups.html
-	-rm -f $(prefix)/share/scribus/doc/en/developers.html
-	-rm -f $(prefix)/share/scribus/doc/en/doccopyright.html
-	-rm -f $(prefix)/share/scribus/doc/en/docinfo.html
-	-rm -f $(prefix)/share/scribus/doc/en/download.html
-	-rm -f $(prefix)/share/scribus/doc/en/install-dpkg.html
-	-rm -f $(prefix)/share/scribus/doc/en/faq1.html
-	-rm -f $(prefix)/share/scribus/doc/en/faq2.html
-	-rm -f $(prefix)/share/scribus/doc/en/faq3.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts1.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts2.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts3.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts4.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts5.html
-	-rm -f $(prefix)/share/scribus/doc/en/gettexthowto.html
-	-rm -f $(prefix)/share/scribus/doc/en/gsfont.html
-	-rm -f $(prefix)/share/scribus/doc/en/gsview.html
-	-rm -f $(prefix)/share/scribus/doc/en/hyphenator.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints1.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints2.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints3.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints4.html
-	-rm -f $(prefix)/share/scribus/doc/en/index.html
-	-rm -f $(prefix)/share/scribus/doc/en/install1.html
-	-rm -f $(prefix)/share/scribus/doc/en/install2.html
-	-rm -f $(prefix)/share/scribus/doc/en/install3.html
-	-rm -f $(prefix)/share/scribus/doc/en/install.html
-	-rm -f $(prefix)/share/scribus/doc/en/intro.html
-	-rm -f $(prefix)/share/scribus/doc/en/irc.html
-	-rm -f $(prefix)/share/scribus/doc/en/javascriptpdf.html
-	-rm -f $(prefix)/share/scribus/doc/en/keys.html
-	-rm -f $(prefix)/share/scribus/doc/en/machints1.html
-	-rm -f $(prefix)/share/scribus/doc/en/machints2.html
-	-rm -f $(prefix)/share/scribus/doc/en/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/en/moncal.html
-	-rm -f $(prefix)/share/scribus/doc/en/mouse.html
-	-rm -f $(prefix)/share/scribus/doc/en/pagetemplate1.html
-	-rm -f $(prefix)/share/scribus/doc/en/parallel-install.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfexport1.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfexport2.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfexport3.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfexport4.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdflavor.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfx3.html
-	-rm -f $(prefix)/share/scribus/doc/en/plugin_howto.html
-	-rm -f $(prefix)/share/scribus/doc/en/prepress.html
-	-rm -f $(prefix)/share/scribus/doc/en/print1.html
-	-rm -f $(prefix)/share/scribus/doc/en/print2.html
-	-rm -f $(prefix)/share/scribus/doc/en/print3.html
-	-rm -f $(prefix)/share/scribus/doc/en/readme.html
-	-rm -f $(prefix)/share/scribus/doc/en/resources.html
-	-rm -f $(prefix)/share/scribus/doc/en/scprinters.html
-	-rm -f $(prefix)/share/scribus/doc/en/scribuscopyright.html
-	-rm -f $(prefix)/share/scribus/doc/en/scribusfileformat.html
-	-rm -f $(prefix)/share/scribus/doc/en/scribus-svg.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripter1.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripter-extensions.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripter-faq.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-color.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-constants.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-dialogs.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-doc.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-font.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-getobjprop.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-layer.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-manobj.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-object.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-page.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-select.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-setobjprop.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-textframes.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-PDFfile.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-Printer.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-ImageExport.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-pydoc.html
-	-rm -f $(prefix)/share/scribus/doc/en/settings1.html
-	-rm -f $(prefix)/share/scribus/doc/en/specs.html
-	-rm -f $(prefix)/share/scribus/doc/en/short-words.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox10.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox11.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox12.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox13.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox1.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox2.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox3.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox4.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox5.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox6.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox7.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox8.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox9.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox.html
-	-rm -f $(prefix)/share/scribus/doc/en/topten.html
-	-rm -f $(prefix)/share/scribus/doc/en/translation_howto.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdf_form.html
-	-rm -f $(prefix)/share/scribus/doc/en/otherinfo.html
-	-rm -f $(prefix)/share/scribus/doc/en/documentation.html
-	-rm -f $(prefix)/share/scribus/doc/en/tutorials.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/about1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/about2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cms.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cms2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cms3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cms4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/codingstandards.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/contributions.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cross-platform.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cups.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/developers.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/doccopyright.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/docinfo.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/download.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install-dpkg.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/faq1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/faq2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/faq3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts5.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/gettexthowto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/gsfont.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/gsview.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/hyphenator.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/index.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/intro.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/irc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/javascriptpdf.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/keys.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/machints1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/machints2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/moncal.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/mouse.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pagetemplate1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/parallel-install.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdflavor.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfx3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/plugin_howto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/prepress.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/print1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/print2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/print3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/readme.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/resources.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scprinters.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scribuscopyright.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scribusfileformat.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scribus-svg.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripter1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripter-extensions.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripter-faq.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-color.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-constants.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-dialogs.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-doc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-font.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-getobjprop.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-layer.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-manobj.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-object.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-page.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-select.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-setobjprop.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-textframes.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-PDFfile.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-Printer.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-ImageExport.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-pydoc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/settings1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/specs.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/short-words.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox10.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox11.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox12.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox13.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox5.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox6.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox7.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox8.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox9.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/topten.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/translation_howto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdf_form.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/otherinfo.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/documentation.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials.html
 
diff -Naur Scribus/scribus/doc/fr/tutorials/short-words/Makefile.am Scribus-fhs/scribus/doc/fr/tutorials/short-words/Makefile.am
--- Scribus/scribus/doc/fr/tutorials/short-words/Makefile.am	2005-01-23 21:43:44.000000000 +0100
+++ Scribus-fhs/scribus/doc/fr/tutorials/short-words/Makefile.am	2006-03-27 00:12:59.980609250 +0200
@@ -1,24 +1,24 @@
 EXTRA_DIST = menu.xml after_short_words.png before_short_words.png dialog.png menu.png short-words-manual.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/menu.xml
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/after_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/before_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/dialog.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/menu.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/short-words-manual.html
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/menu.xml
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/after_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/before_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/dialog.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/menu.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/short-words-manual.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/after_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/before_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/dialog.png
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/menu.png
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/short-words-manual.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/after_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/before_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/dialog.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/menu.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/short-words-manual.html
diff -Naur Scribus/scribus/doc/pl/tutorials/short-words/Makefile.am Scribus-fhs/scribus/doc/pl/tutorials/short-words/Makefile.am
--- Scribus/scribus/doc/pl/tutorials/short-words/Makefile.am	2005-01-23 21:47:14.000000000 +0100
+++ Scribus-fhs/scribus/doc/pl/tutorials/short-words/Makefile.am	2006-03-27 00:12:59.980609250 +0200
@@ -1,24 +1,24 @@
 EXTRA_DIST = menu.xml after_short_words.png before_short_words.png dialog.png menu.png short-words-manual.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/menu.xml
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/after_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/before_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/dialog.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/menu.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/short-words-manual.html
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/menu.xml
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/after_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/before_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/dialog.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/menu.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/short-words-manual.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/after_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/before_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/dialog.png
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/menu.png
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/short-words-manual.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/after_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/before_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/dialog.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/menu.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/short-words-manual.html
diff -Naur Scribus/scribus/libabout/Makefile.am Scribus-fhs/scribus/libabout/Makefile.am
--- Scribus/scribus/libabout/Makefile.am	2004-12-11 22:53:41.000000000 +0100
+++ Scribus-fhs/scribus/libabout/Makefile.am	2006-03-27 00:12:59.984609500 +0200
@@ -20,7 +20,7 @@
 AM_LDFLAGS =  $(linkflag) $(LIBFREETYPE_LIBS)
 
 AM_CPPFLAGS = \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/libpdf/Makefile.am Scribus-fhs/scribus/libpdf/Makefile.am
--- Scribus/scribus/libpdf/Makefile.am	2004-12-11 22:53:41.000000000 +0100
+++ Scribus-fhs/scribus/libpdf/Makefile.am	2006-03-27 00:12:59.984609500 +0200
@@ -29,7 +29,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/libpostscript/Makefile.am Scribus-fhs/scribus/libpostscript/Makefile.am
--- Scribus/scribus/libpostscript/Makefile.am	2004-12-11 22:53:41.000000000 +0100
+++ Scribus-fhs/scribus/libpostscript/Makefile.am	2006-03-27 00:12:59.988609750 +0200
@@ -28,7 +28,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/libprefs/Makefile.am Scribus-fhs/scribus/libprefs/Makefile.am
--- Scribus/scribus/libprefs/Makefile.am	2004-12-11 22:53:41.000000000 +0100
+++ Scribus-fhs/scribus/libprefs/Makefile.am	2006-03-27 00:12:59.988609750 +0200
@@ -20,7 +20,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/Makefile.am Scribus-fhs/scribus/Makefile.am
--- Scribus/scribus/Makefile.am	2006-01-06 20:42:23.000000000 +0100
+++ Scribus-fhs/scribus/Makefile.am	2006-03-27 00:12:59.924605750 +0200
@@ -226,7 +226,7 @@
 KDE_OPTIONS = qtonly
 
 AM_CPPFLAGS = \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/fileloader/oodraw/Makefile.am Scribus-fhs/scribus/plugins/fileloader/oodraw/Makefile.am
--- Scribus/scribus/plugins/fileloader/oodraw/Makefile.am	2005-03-03 17:52:44.000000000 +0100
+++ Scribus-fhs/scribus/plugins/fileloader/oodraw/Makefile.am	2006-03-27 00:12:59.944607000 +0200
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/fontpreview/Makefile.am Scribus-fhs/scribus/plugins/fontpreview/Makefile.am
--- Scribus/scribus/plugins/fontpreview/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/fontpreview/Makefile.am	2006-03-27 00:12:59.944607000 +0200
@@ -21,7 +21,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/gettext/csvim/Makefile.am Scribus-fhs/scribus/plugins/gettext/csvim/Makefile.am
--- Scribus/scribus/plugins/gettext/csvim/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/csvim/Makefile.am	2006-03-27 00:12:59.948607250 +0200
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/gettext/htmlim/Makefile.am Scribus-fhs/scribus/plugins/gettext/htmlim/Makefile.am
--- Scribus/scribus/plugins/gettext/htmlim/Makefile.am	2005-01-11 23:21:25.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/htmlim/Makefile.am	2006-03-27 00:12:59.948607250 +0200
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/gettext/odtim/Makefile.am Scribus-fhs/scribus/plugins/gettext/odtim/Makefile.am
--- Scribus/scribus/plugins/gettext/odtim/Makefile.am	2005-03-03 18:02:43.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/odtim/Makefile.am	2006-03-27 00:12:59.948607250 +0200
@@ -22,7 +22,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/sxwim/Makefile.am Scribus-fhs/scribus/plugins/gettext/sxwim/Makefile.am
--- Scribus/scribus/plugins/gettext/sxwim/Makefile.am	2005-03-03 17:44:46.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/sxwim/Makefile.am	2006-03-27 00:12:59.948607250 +0200
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/gettext/textfilter/Makefile.am Scribus-fhs/scribus/plugins/gettext/textfilter/Makefile.am
--- Scribus/scribus/plugins/gettext/textfilter/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/textfilter/Makefile.am	2006-03-27 00:12:59.948607250 +0200
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/gettext/txtim/Makefile.am Scribus-fhs/scribus/plugins/gettext/txtim/Makefile.am
--- Scribus/scribus/plugins/gettext/txtim/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/txtim/Makefile.am	2006-03-27 00:12:59.948607250 +0200
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/libchar/Makefile.am Scribus-fhs/scribus/plugins/libchar/Makefile.am
--- Scribus/scribus/plugins/libchar/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/libchar/Makefile.am	2006-03-27 00:12:59.948607250 +0200
@@ -21,7 +21,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/newfromtemplateplugin/Makefile.am Scribus-fhs/scribus/plugins/newfromtemplateplugin/Makefile.am
--- Scribus/scribus/plugins/newfromtemplateplugin/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/newfromtemplateplugin/Makefile.am	2006-03-27 00:12:59.948607250 +0200
@@ -22,7 +22,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/pixmapexport/Makefile.am Scribus-fhs/scribus/plugins/pixmapexport/Makefile.am
--- Scribus/scribus/plugins/pixmapexport/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/pixmapexport/Makefile.am	2006-03-27 00:12:59.952607500 +0200
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/printpreview/Makefile.am Scribus-fhs/scribus/plugins/printpreview/Makefile.am
--- Scribus/scribus/plugins/printpreview/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/printpreview/Makefile.am	2006-03-27 00:12:59.952607500 +0200
@@ -21,7 +21,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/psimport/Makefile.am Scribus-fhs/scribus/plugins/psimport/Makefile.am
--- Scribus/scribus/plugins/psimport/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/psimport/Makefile.am	2006-03-27 00:12:59.952607500 +0200
@@ -30,7 +30,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/saveastemplateplugin/Makefile.am Scribus-fhs/scribus/plugins/saveastemplateplugin/Makefile.am
--- Scribus/scribus/plugins/saveastemplateplugin/Makefile.am	2004-12-11 22:53:42.000000000 +0100
+++ Scribus-fhs/scribus/plugins/saveastemplateplugin/Makefile.am	2006-03-27 00:12:59.952607500 +0200
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/scriptplugin/Makefile.am Scribus-fhs/scribus/plugins/scriptplugin/Makefile.am
--- Scribus/scribus/plugins/scriptplugin/Makefile.am	2005-02-08 14:54:31.000000000 +0100
+++ Scribus-fhs/scribus/plugins/scriptplugin/Makefile.am	2006-03-27 00:12:59.952607500 +0200
@@ -22,7 +22,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus $(PYTHONINC) \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/short-words/Makefile.am Scribus-fhs/scribus/plugins/short-words/Makefile.am
--- Scribus/scribus/plugins/short-words/Makefile.am	2005-02-10 19:48:35.000000000 +0100
+++ Scribus-fhs/scribus/plugins/short-words/Makefile.am	2006-03-27 00:12:59.956607750 +0200
@@ -21,7 +21,7 @@
 
 AM_CPPFLAGS = \
         -I$(top_builddir)/scribus \
-        -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+        -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
         -DICONDIR=\"$(datadir)/scribus/icons/\" \
         -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
         -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/svgexplugin/Makefile.am Scribus-fhs/scribus/plugins/svgexplugin/Makefile.am
--- Scribus/scribus/plugins/svgexplugin/Makefile.am	2004-12-11 22:53:43.000000000 +0100
+++ Scribus-fhs/scribus/plugins/svgexplugin/Makefile.am	2006-03-27 00:12:59.956607750 +0200
@@ -21,7 +21,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
diff -Naur Scribus/scribus/plugins/svgimplugin/Makefile.am Scribus-fhs/scribus/plugins/svgimplugin/Makefile.am
--- Scribus/scribus/plugins/svgimplugin/Makefile.am	2004-12-11 22:53:43.000000000 +0100
+++ Scribus-fhs/scribus/plugins/svgimplugin/Makefile.am	2006-03-27 00:12:59.956607750 +0200
@@ -22,7 +22,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DTEMPLATEDIR=\"$(datadir)/scribus/templates/\" \
     -DLIBDIR=\"$(libdir)/scribus/\" \
scribus-1.2-fhs.diff (135,709 bytes)   

2006-03-26 22:20

 

scribus-1.3-fhs.diff (110,278 bytes)   
diff -Naur Scribus/Makefile.am Scribus-fhs/Makefile.am
--- Scribus/Makefile.am	2006-01-24 10:54:42.000000000 +0100
+++ Scribus-fhs/Makefile.am	2006-03-27 00:12:10.089491250 +0200
@@ -62,7 +62,7 @@
 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
 
 AM_CPPFLAGS = \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
@@ -78,15 +78,15 @@
 install-data-local:
 	$(mkinstalldirs) $(prefix)/share
 	$(mkinstalldirs) $(prefix)/share/scribus
-	$(mkinstalldirs) $(prefix)/share/scribus/doc
-	$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(prefix)/share/scribus/doc/AUTHORS
-	$(INSTALL_DATA) $(top_srcdir)/BUILDING $(prefix)/share/scribus/doc/BUILDING
-	$(INSTALL_DATA) $(top_srcdir)/ChangeLogCVS $(prefix)/share/scribus/doc/ChangeLogCVS
-	$(INSTALL_DATA) $(top_srcdir)/ChangeLog $(prefix)/share/scribus/doc/ChangeLog
-	$(INSTALL_DATA) $(top_srcdir)/COPYING $(prefix)/share/scribus/doc/COPYING
-	$(INSTALL_DATA) $(top_srcdir)/INSTALL $(prefix)/share/scribus/doc/INSTALL
-	$(INSTALL_DATA) $(top_srcdir)/NEWS $(prefix)/share/scribus/doc/NEWS
-	$(INSTALL_DATA) $(top_srcdir)/PACKAGING $(prefix)/share/scribus/doc/PACKAGING
-	$(INSTALL_DATA) $(top_srcdir)/README.MacOSX $(prefix)/share/scribus/doc/README.MacOSX
-	$(INSTALL_DATA) $(top_srcdir)/README $(prefix)/share/scribus/doc/README
-	$(INSTALL_DATA) $(top_srcdir)/TODO $(prefix)/share/scribus/doc/TODO
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)
+	$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(prefix)/share/doc/scribus-$(VERSION)/AUTHORS
+	$(INSTALL_DATA) $(top_srcdir)/BUILDING $(prefix)/share/doc/scribus-$(VERSION)/BUILDING
+	$(INSTALL_DATA) $(top_srcdir)/ChangeLogCVS $(prefix)/share/doc/scribus-$(VERSION)/ChangeLogCVS
+	$(INSTALL_DATA) $(top_srcdir)/ChangeLog $(prefix)/share/doc/scribus-$(VERSION)/ChangeLog
+	$(INSTALL_DATA) $(top_srcdir)/COPYING $(prefix)/share/doc/scribus-$(VERSION)/COPYING
+	$(INSTALL_DATA) $(top_srcdir)/INSTALL $(prefix)/share/doc/scribus-$(VERSION)/INSTALL
+	$(INSTALL_DATA) $(top_srcdir)/NEWS $(prefix)/share/doc/scribus-$(VERSION)/NEWS
+	$(INSTALL_DATA) $(top_srcdir)/PACKAGING $(prefix)/share/doc/scribus-$(VERSION)/PACKAGING
+	$(INSTALL_DATA) $(top_srcdir)/README.MacOSX $(prefix)/share/doc/scribus-$(VERSION)/README.MacOSX
+	$(INSTALL_DATA) $(top_srcdir)/README $(prefix)/share/doc/scribus-$(VERSION)/README
+	$(INSTALL_DATA) $(top_srcdir)/TODO $(prefix)/share/doc/scribus-$(VERSION)/TODO
diff -Naur Scribus/scribus/doc/cs/tutorials/short-words/Makefile.am Scribus-fhs/scribus/doc/cs/tutorials/short-words/Makefile.am
--- Scribus/scribus/doc/cs/tutorials/short-words/Makefile.am	2005-01-26 21:46:23.000000000 +0100
+++ Scribus-fhs/scribus/doc/cs/tutorials/short-words/Makefile.am	2006-03-27 00:12:10.097491750 +0200
@@ -1,24 +1,24 @@
 EXTRA_DIST = menu.xml after_short_words.png before_short_words.png dialog.png menu.png short-words-manual.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/menu.xml
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/after_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/before_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/dialog.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/menu.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/short-words-manual.html
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/menu.xml
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/after_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/before_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/dialog.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/menu.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/short-words-manual.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/after_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/before_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/dialog.png
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/menu.png
-	-rm -f $(prefix)/share/scribus/doc/cs/tutorials/scribus-short-words/short-words-manual.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/after_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/before_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/dialog.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/menu.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/cs/tutorials/scribus-short-words/short-words-manual.html
diff -Naur Scribus/scribus/doc/en/images/Makefile.am Scribus-fhs/scribus/doc/en/images/Makefile.am
--- Scribus/scribus/doc/en/images/Makefile.am	2006-03-24 18:01:24.000000000 +0100
+++ Scribus-fhs/scribus/doc/en/images/Makefile.am	2006-03-27 00:12:10.109492500 +0200
@@ -2,212 +2,212 @@
 
 install-data-local:
 
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/scribus/doc/en/images/
-	$(INSTALL_DATA) $(srcdir)/acropass.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acropass.png
-	$(INSTALL_DATA) $(srcdir)/acroinfo.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acroinfo.png
-	$(INSTALL_DATA) $(srcdir)/acrosec.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acrosec.png
-	$(INSTALL_DATA) $(srcdir)/acro1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro1.png
-	$(INSTALL_DATA) $(srcdir)/acro2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro2.png
-	$(INSTALL_DATA) $(srcdir)/acro3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro3.png
-	$(INSTALL_DATA) $(srcdir)/acroreader5.1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acroreader5.1.png
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/after_short_words.png
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/before_short_words.png
-	$(INSTALL_DATA) $(srcdir)/batik1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/batik1.png
-	$(INSTALL_DATA) $(srcdir)/cmspanel.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmspanel.png
-	$(INSTALL_DATA) $(srcdir)/cmsmodify1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmsmodify1.png
-	$(INSTALL_DATA) $(srcdir)/colormgmtscreen.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormgmtscreen.png
-	$(INSTALL_DATA) $(srcdir)/colormanager2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormanager2.png
-	$(INSTALL_DATA) $(srcdir)/cups1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cups1.png
-	$(INSTALL_DATA) $(srcdir)/cups2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cups2.png
-	$(INSTALL_DATA) $(srcdir)/docheader1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docheader1.png
-	$(INSTALL_DATA) $(srcdir)/docheader2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docheader2.png
-	$(INSTALL_DATA) $(srcdir)/docinfo.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docinfo.png
-	$(INSTALL_DATA) $(srcdir)/docinfo2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docinfo2.png
-	$(INSTALL_DATA) $(srcdir)/fontpref1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref1.png
-	$(INSTALL_DATA) $(srcdir)/fontpref2.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref2.png 
-	$(INSTALL_DATA) $(srcdir)/fontpref3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref3.png
-	$(INSTALL_DATA) $(srcdir)/fontpref4.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref4.png
-	$(INSTALL_DATA) $(srcdir)/fonts.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts.png 
-	$(INSTALL_DATA) $(srcdir)/fonts2.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts2.png 
-	$(INSTALL_DATA) $(srcdir)/fonts3.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts3.png 
-	$(INSTALL_DATA) $(srcdir)/fonts4.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts4.png 
-	$(INSTALL_DATA) $(srcdir)/fontprev.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontprev.png
-	$(INSTALL_DATA) $(srcdir)/fontsampler.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontsampler.png
-	$(INSTALL_DATA) $(srcdir)/fontsampler2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontsampler2.png
-	$(INSTALL_DATA) $(srcdir)/gammagrayscale.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gammagrayscale.png
-	$(INSTALL_DATA) $(srcdir)/gimpoptions1.png  $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions1.png 
-	$(INSTALL_DATA) $(srcdir)/gimpoptions2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions2.png
-	$(INSTALL_DATA) $(srcdir)/gimpoptions3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions3.png
-	$(INSTALL_DATA) $(srcdir)/gsadv1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv1.png
-	$(INSTALL_DATA) $(srcdir)/gsadv2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv2.png
-	$(INSTALL_DATA) $(srcdir)/gsadv3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv3.png
-	$(INSTALL_DATA) $(srcdir)/htmlstyle.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/htmlstyle.png
-	$(INSTALL_DATA) $(srcdir)/htmlimport.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/htmlimport.png
-	$(INSTALL_DATA) $(srcdir)/hyphen1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen1.png
-	$(INSTALL_DATA) $(srcdir)/hyphen2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen2.png
-	$(INSTALL_DATA) $(srcdir)/hyphen3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen3.png
-	$(INSTALL_DATA) $(srcdir)/inkscape.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/inkscape.png
-	$(INSTALL_DATA) $(srcdir)/kfontinstaller.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/kfontinstaller.png
-	$(INSTALL_DATA) $(srcdir)/ksnapshot.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ksnapshot.png
-	$(INSTALL_DATA) $(srcdir)/monprof1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof1.png
-	$(INSTALL_DATA) $(srcdir)/monprof2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof2.png
-	$(INSTALL_DATA) $(srcdir)/monprof3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof3.png
-	$(INSTALL_DATA) $(srcdir)/monprof4.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof4.png
-	$(INSTALL_DATA) $(srcdir)/ooeps1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ooeps1.png
-	$(INSTALL_DATA) $(srcdir)/oochart.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/oochart.png
-	$(INSTALL_DATA) $(srcdir)/oogettext1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/oogettext1.png
-	$(INSTALL_DATA) $(srcdir)/pagetemplate1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pagetemplate1.png
-	$(INSTALL_DATA) $(srcdir)/pdfeffect1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfeffect1.png
-	$(INSTALL_DATA) $(srcdir)/pdfeffect2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfeffect2.png
-	$(INSTALL_DATA) $(srcdir)/pdfxcolor.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfxcolor.png
-	$(INSTALL_DATA) $(srcdir)/pdfxintent.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfxintent.png
-	$(INSTALL_DATA) $(srcdir)/pstoedit1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pstoedit1.png
-	$(INSTALL_DATA) $(srcdir)/pdfx3-1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfx3-1.png 
-	$(INSTALL_DATA) $(srcdir)/prefsblgrid1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefsblgrid1.png
-	$(INSTALL_DATA) $(srcdir)/prefs.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs.png 
-	$(INSTALL_DATA) $(srcdir)/prefs2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs2.png
-	$(INSTALL_DATA) $(srcdir)/prefs3.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs3.png
-	$(INSTALL_DATA) $(srcdir)/prefs4.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs4.png
-	$(INSTALL_DATA) $(srcdir)/prefs5.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs5.png
-	$(INSTALL_DATA) $(srcdir)/prefs6.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs6.png
-	$(INSTALL_DATA) $(srcdir)/prefs8.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs8.png
-	$(INSTALL_DATA) $(srcdir)/prefs10.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs10.png
-	$(INSTALL_DATA) $(srcdir)/prefs11.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs11.png
-	$(INSTALL_DATA) $(srcdir)/prefs12.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs12.png
-	$(INSTALL_DATA) $(srcdir)/prefs15.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs15.png
-	$(INSTALL_DATA) $(srcdir)/prefsdisplay.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefsdisplay.png
-	$(INSTALL_DATA) $(srcdir)/prefs-mac-1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs-mac-1.png
-	$(INSTALL_DATA) $(srcdir)/RDF.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/RDF.png
-	$(INSTALL_DATA) $(srcdir)/printer1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printer1.png
-	$(INSTALL_DATA) $(srcdir)/printer2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printer2.png
-	$(INSTALL_DATA) $(srcdir)/printseps.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printseps.png
-	$(INSTALL_DATA) $(srcdir)/printpreview.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printpreview.png
-	$(INSTALL_DATA) $(srcdir)/result.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/result.png
-	$(INSTALL_DATA) $(srcdir)/Scripter_error_string.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/Scripter_error_string.png
-	$(INSTALL_DATA) $(srcdir)/Scripter.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/Scripter.png
-	$(INSTALL_DATA) $(srcdir)/scribus2.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribus2.png
-	$(INSTALL_DATA) $(srcdir)/scribuscms1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribuscms1.png
-	$(INSTALL_DATA) $(srcdir)/scribustru4.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribustru4.png
-	$(INSTALL_DATA) $(srcdir)/spinbox1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/spinbox1.png
-	$(INSTALL_DATA) $(srcdir)/swmenu.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/swmenu.png
-	$(INSTALL_DATA) $(srcdir)/swdialog.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/swdialog.png
-	$(INSTALL_DATA) $(srcdir)/svg1.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/svg1.png
-	$(INSTALL_DATA) $(srcdir)/xnview.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/xnview.png
-	$(INSTALL_DATA) $(srcdir)/formularz_export_PDF.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_export_PDF.png
-	$(INSTALL_DATA) $(srcdir)/formularz_js_skrypt.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_js_skrypt.png
-	$(INSTALL_DATA) $(srcdir)/formularz_js_sprawdzanie.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_js_sprawdzanie.png
-	$(INSTALL_DATA) $(srcdir)/formularz_nowy.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_nowy.png
-	$(INSTALL_DATA) $(srcdir)/formularz_pole_num.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_pole_num.png
-	$(INSTALL_DATA) $(srcdir)/siatka_jednostki_miar.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/siatka_jednostki_miar.png
-	$(INSTALL_DATA) $(srcdir)/siatka_menu.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/siatka_menu.png
-	$(INSTALL_DATA) $(srcdir)/symbole.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/symbole.png
-	$(INSTALL_DATA) $(srcdir)/ulica.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ulica.png
-	$(INSTALL_DATA) $(srcdir)/wlasciwosci_pola.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/wlasciwosci_pola.png
-	$(INSTALL_DATA) $(srcdir)/wyslij_formularz.png $(DESTDIR)$(prefix)/share/scribus/doc/en/images/wyslij_formularz.png
+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/
+	$(INSTALL_DATA) $(srcdir)/acropass.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acropass.png
+	$(INSTALL_DATA) $(srcdir)/acroinfo.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acroinfo.png
+	$(INSTALL_DATA) $(srcdir)/acrosec.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acrosec.png
+	$(INSTALL_DATA) $(srcdir)/acro1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro1.png
+	$(INSTALL_DATA) $(srcdir)/acro2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro2.png
+	$(INSTALL_DATA) $(srcdir)/acro3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro3.png
+	$(INSTALL_DATA) $(srcdir)/acroreader5.1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acroreader5.1.png
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/after_short_words.png
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/before_short_words.png
+	$(INSTALL_DATA) $(srcdir)/batik1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/batik1.png
+	$(INSTALL_DATA) $(srcdir)/cmspanel.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmspanel.png
+	$(INSTALL_DATA) $(srcdir)/cmsmodify1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmsmodify1.png
+	$(INSTALL_DATA) $(srcdir)/colormgmtscreen.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormgmtscreen.png
+	$(INSTALL_DATA) $(srcdir)/colormanager2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormanager2.png
+	$(INSTALL_DATA) $(srcdir)/cups1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cups1.png
+	$(INSTALL_DATA) $(srcdir)/cups2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cups2.png
+	$(INSTALL_DATA) $(srcdir)/docheader1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docheader1.png
+	$(INSTALL_DATA) $(srcdir)/docheader2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docheader2.png
+	$(INSTALL_DATA) $(srcdir)/docinfo.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docinfo.png
+	$(INSTALL_DATA) $(srcdir)/docinfo2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docinfo2.png
+	$(INSTALL_DATA) $(srcdir)/fontpref1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref1.png
+	$(INSTALL_DATA) $(srcdir)/fontpref2.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref2.png 
+	$(INSTALL_DATA) $(srcdir)/fontpref3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref3.png
+	$(INSTALL_DATA) $(srcdir)/fontpref4.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref4.png
+	$(INSTALL_DATA) $(srcdir)/fonts.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts.png 
+	$(INSTALL_DATA) $(srcdir)/fonts2.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts2.png 
+	$(INSTALL_DATA) $(srcdir)/fonts3.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts3.png 
+	$(INSTALL_DATA) $(srcdir)/fonts4.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts4.png 
+	$(INSTALL_DATA) $(srcdir)/fontprev.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontprev.png
+	$(INSTALL_DATA) $(srcdir)/fontsampler.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontsampler.png
+	$(INSTALL_DATA) $(srcdir)/fontsampler2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontsampler2.png
+	$(INSTALL_DATA) $(srcdir)/gammagrayscale.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gammagrayscale.png
+	$(INSTALL_DATA) $(srcdir)/gimpoptions1.png  $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions1.png 
+	$(INSTALL_DATA) $(srcdir)/gimpoptions2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions2.png
+	$(INSTALL_DATA) $(srcdir)/gimpoptions3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions3.png
+	$(INSTALL_DATA) $(srcdir)/gsadv1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv1.png
+	$(INSTALL_DATA) $(srcdir)/gsadv2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv2.png
+	$(INSTALL_DATA) $(srcdir)/gsadv3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv3.png
+	$(INSTALL_DATA) $(srcdir)/htmlstyle.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/htmlstyle.png
+	$(INSTALL_DATA) $(srcdir)/htmlimport.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/htmlimport.png
+	$(INSTALL_DATA) $(srcdir)/hyphen1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen1.png
+	$(INSTALL_DATA) $(srcdir)/hyphen2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen2.png
+	$(INSTALL_DATA) $(srcdir)/hyphen3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen3.png
+	$(INSTALL_DATA) $(srcdir)/inkscape.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/inkscape.png
+	$(INSTALL_DATA) $(srcdir)/kfontinstaller.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/kfontinstaller.png
+	$(INSTALL_DATA) $(srcdir)/ksnapshot.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ksnapshot.png
+	$(INSTALL_DATA) $(srcdir)/monprof1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof1.png
+	$(INSTALL_DATA) $(srcdir)/monprof2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof2.png
+	$(INSTALL_DATA) $(srcdir)/monprof3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof3.png
+	$(INSTALL_DATA) $(srcdir)/monprof4.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof4.png
+	$(INSTALL_DATA) $(srcdir)/ooeps1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ooeps1.png
+	$(INSTALL_DATA) $(srcdir)/oochart.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/oochart.png
+	$(INSTALL_DATA) $(srcdir)/oogettext1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/oogettext1.png
+	$(INSTALL_DATA) $(srcdir)/pagetemplate1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pagetemplate1.png
+	$(INSTALL_DATA) $(srcdir)/pdfeffect1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfeffect1.png
+	$(INSTALL_DATA) $(srcdir)/pdfeffect2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfeffect2.png
+	$(INSTALL_DATA) $(srcdir)/pdfxcolor.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfxcolor.png
+	$(INSTALL_DATA) $(srcdir)/pdfxintent.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfxintent.png
+	$(INSTALL_DATA) $(srcdir)/pstoedit1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pstoedit1.png
+	$(INSTALL_DATA) $(srcdir)/pdfx3-1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfx3-1.png 
+	$(INSTALL_DATA) $(srcdir)/prefsblgrid1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefsblgrid1.png
+	$(INSTALL_DATA) $(srcdir)/prefs.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs.png 
+	$(INSTALL_DATA) $(srcdir)/prefs2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs2.png
+	$(INSTALL_DATA) $(srcdir)/prefs3.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs3.png
+	$(INSTALL_DATA) $(srcdir)/prefs4.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs4.png
+	$(INSTALL_DATA) $(srcdir)/prefs5.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs5.png
+	$(INSTALL_DATA) $(srcdir)/prefs6.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs6.png
+	$(INSTALL_DATA) $(srcdir)/prefs8.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs8.png
+	$(INSTALL_DATA) $(srcdir)/prefs10.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs10.png
+	$(INSTALL_DATA) $(srcdir)/prefs11.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs11.png
+	$(INSTALL_DATA) $(srcdir)/prefs12.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs12.png
+	$(INSTALL_DATA) $(srcdir)/prefs15.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs15.png
+	$(INSTALL_DATA) $(srcdir)/prefsdisplay.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefsdisplay.png
+	$(INSTALL_DATA) $(srcdir)/prefs-mac-1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs-mac-1.png
+	$(INSTALL_DATA) $(srcdir)/RDF.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/RDF.png
+	$(INSTALL_DATA) $(srcdir)/printer1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printer1.png
+	$(INSTALL_DATA) $(srcdir)/printer2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printer2.png
+	$(INSTALL_DATA) $(srcdir)/printseps.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printseps.png
+	$(INSTALL_DATA) $(srcdir)/printpreview.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printpreview.png
+	$(INSTALL_DATA) $(srcdir)/result.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/result.png
+	$(INSTALL_DATA) $(srcdir)/Scripter_error_string.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/Scripter_error_string.png
+	$(INSTALL_DATA) $(srcdir)/Scripter.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/Scripter.png
+	$(INSTALL_DATA) $(srcdir)/scribus2.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribus2.png
+	$(INSTALL_DATA) $(srcdir)/scribuscms1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribuscms1.png
+	$(INSTALL_DATA) $(srcdir)/scribustru4.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribustru4.png
+	$(INSTALL_DATA) $(srcdir)/spinbox1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/spinbox1.png
+	$(INSTALL_DATA) $(srcdir)/swmenu.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/swmenu.png
+	$(INSTALL_DATA) $(srcdir)/swdialog.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/swdialog.png
+	$(INSTALL_DATA) $(srcdir)/svg1.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/svg1.png
+	$(INSTALL_DATA) $(srcdir)/xnview.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/xnview.png
+	$(INSTALL_DATA) $(srcdir)/formularz_export_PDF.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_export_PDF.png
+	$(INSTALL_DATA) $(srcdir)/formularz_js_skrypt.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_js_skrypt.png
+	$(INSTALL_DATA) $(srcdir)/formularz_js_sprawdzanie.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_js_sprawdzanie.png
+	$(INSTALL_DATA) $(srcdir)/formularz_nowy.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_nowy.png
+	$(INSTALL_DATA) $(srcdir)/formularz_pole_num.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_pole_num.png
+	$(INSTALL_DATA) $(srcdir)/siatka_jednostki_miar.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/siatka_jednostki_miar.png
+	$(INSTALL_DATA) $(srcdir)/siatka_menu.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/siatka_menu.png
+	$(INSTALL_DATA) $(srcdir)/symbole.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/symbole.png
+	$(INSTALL_DATA) $(srcdir)/ulica.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ulica.png
+	$(INSTALL_DATA) $(srcdir)/wlasciwosci_pola.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/wlasciwosci_pola.png
+	$(INSTALL_DATA) $(srcdir)/wyslij_formularz.png $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/wyslij_formularz.png
 
 uninstall-local:
 
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acro3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acroreader5.1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acroinfo.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acropass.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/after_short_words.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/before_short_words.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/acrosec.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/batik1.png	
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmsmodify1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmspanel.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormanager2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormgmtscreen.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cups1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cups2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/cmspanel.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/colormanager2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docinfo.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docinfo2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docheader1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/docheader2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontprev.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fonts4.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref1.png 
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontpref4.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontprev.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontsampler.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/fontsampler2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gammagrayscale.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gimpoptions3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/gsadv3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/htmlstyle.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/htmlimport.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/hyphen3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/inkscape.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/kfontinstaller.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ksnapshot.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/monprof4.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ooeps1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/oochart.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/oogettext1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pagetemplate1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfeffect1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfeffect2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfxcolor.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfxintent.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefsblgrid1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs3.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs4.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs5.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs6.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs8.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs10.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs11.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs12.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs15.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefsdisplay.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/prefs-mac-1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printer1.png 
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printer2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printpreview.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/printseps.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pstoedit1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/pdfx3-1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/result.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/RDF.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/spinbox1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/Scripter.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/Scripter_error_string.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribus2.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribustru4.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/svg1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/scribuscms1.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/swdialog.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/swmenu.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/xnview.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_export_PDF.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_js_skrypt.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_js_sprawdzanie.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_nowy.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/formularz_pole_num.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/siatka_jednostki_miar.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/siatka_menu.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/symbole.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/ulica.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/wlasciwosci_pola.png
-	-rm -f $(DESTDIR)$(prefix)/share/scribus/doc/en/images/wyslij_formularz.png
\ Kein Zeilenumbruch am Dateiende.
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acro3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acroreader5.1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acroinfo.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acropass.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/after_short_words.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/before_short_words.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/acrosec.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/batik1.png	
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmsmodify1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmspanel.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormanager2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormgmtscreen.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cups1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cups2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/cmspanel.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/colormanager2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docinfo.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docinfo2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docheader1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/docheader2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontprev.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fonts4.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref1.png 
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontpref4.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontprev.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontsampler.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/fontsampler2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gammagrayscale.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gimpoptions3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/gsadv3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/htmlstyle.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/htmlimport.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/hyphen3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/inkscape.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/kfontinstaller.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ksnapshot.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/monprof4.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ooeps1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/oochart.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/oogettext1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pagetemplate1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfeffect1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfeffect2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfxcolor.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfxintent.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefsblgrid1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs3.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs4.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs5.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs6.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs8.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs10.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs11.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs12.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs15.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefsdisplay.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/prefs-mac-1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printer1.png 
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printer2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printpreview.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/printseps.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pstoedit1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/pdfx3-1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/result.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/RDF.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/spinbox1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/Scripter.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/Scripter_error_string.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribus2.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribustru4.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/svg1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/scribuscms1.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/swdialog.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/swmenu.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/xnview.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_export_PDF.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_js_skrypt.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_js_sprawdzanie.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_nowy.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/formularz_pole_num.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/siatka_jednostki_miar.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/siatka_menu.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/symbole.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/ulica.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/wlasciwosci_pola.png
+	-rm -f $(DESTDIR)$(prefix)/share/doc/scribus-$(VERSION)/en/images/wyslij_formularz.png
\ Kein Zeilenumbruch am Dateiende.
diff -Naur Scribus/scribus/doc/en/Makefile.am Scribus-fhs/scribus/doc/en/Makefile.am
--- Scribus/scribus/doc/en/Makefile.am	2006-01-20 22:59:52.000000000 +0100
+++ Scribus-fhs/scribus/doc/en/Makefile.am	2006-03-27 00:12:10.105492250 +0200
@@ -3,228 +3,228 @@
 EXTRA_DIST = about1.html about2.html cms.html cms2.html cms3.html cms4.html codingstandards.html contributions.html cross-platform.html cups.html  developers.html  doccopyright.html docinfo.html download.html faq1.html faq2.html faq3.html fonts1.html fonts2.html fonts3.html fonts4.html fonts5.html fonts-win32.html gettexthowto.html gsfont.html  hyphenator.html importhints1.html importhints2.html importhints.html importhints3.html  importhints4.html index.html install1.html install2.html install3.html install.html install-dpkg.html intro.html irc.html javascriptpdf.html keys.html machints1.html machints2.html menu.xml moncal.html mouse.html pagetemplate1.html parallel-install.html pdflavor.html pdfexport1.html pdfexport2.html pdfexport3.html pdfexport4.html pdfx3.html pdf_form.html plugin_howto.html prepress.html print1.html print2.html print3.html  readme.html readme-win32.html resources.html scprinters.html scribuscopyright.html scribusfileformat.html scribus-svg.html scripter1.html scripter-extensions.html scripterapi-color.html scripterapi-constants.html scripterapi-dialogs.html scripterapi-doc.html scripterapi-font.html scripterapi-getobjprop.html scripterapi.html scripterapi-layer.html scripterapi-manobj.html scripterapi-object.html scripterapi-page.html scripterapi-select.html scripterapi-setobjprop.html scripterapi-textframes.html scripter-faq.html scripterapi-pydoc.html scripterapi-PDFfile.html scripterapi-Printer.html scripterapi-ImageExport.html settings1.html specs.html  short-words.html toolbox10.html toolbox11.html toolbox12.html toolbox13.html toolbox1.html toolbox2.html toolbox3.html toolbox4.html toolbox5.html toolbox6.html toolbox7.html toolbox8.html toolbox9.html toolbox.html topten.html translation_howto.html  otherinfo.html documentation.html tutorials.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/
-	$(INSTALL_DATA) $(srcdir)/about1.html $(prefix)/share/scribus/doc/en/about1.html
-	$(INSTALL_DATA) $(srcdir)/about2.html $(prefix)/share/scribus/doc/en/about2.html
-	$(INSTALL_DATA) $(srcdir)/cms.html $(prefix)/share/scribus/doc/en/cms.html
-	$(INSTALL_DATA) $(srcdir)/cms2.html $(prefix)/share/scribus/doc/en/cms2.html
-	$(INSTALL_DATA) $(srcdir)/cms3.html $(prefix)/share/scribus/doc/en/cms3.html
-	$(INSTALL_DATA) $(srcdir)/cms4.html $(prefix)/share/scribus/doc/en/cms4.html
-	$(INSTALL_DATA) $(srcdir)/codingstandards.html $(prefix)/share/scribus/doc/en/codingstandards.html
-	$(INSTALL_DATA) $(srcdir)/contributions.html $(prefix)/share/scribus/doc/en/contributions.html
-	$(INSTALL_DATA) $(srcdir)/cross-platform.html $(prefix)/share/scribus/doc/en/cross-platform.html
-	$(INSTALL_DATA) $(srcdir)/cups.html $(prefix)/share/scribus/doc/en/cups.html
-	$(INSTALL_DATA) $(srcdir)/developers.html $(prefix)/share/scribus/doc/en/developers.html
-	$(INSTALL_DATA) $(srcdir)/doccopyright.html $(prefix)/share/scribus/doc/en/doccopyright.html
-	$(INSTALL_DATA) $(srcdir)/docinfo.html $(prefix)/share/scribus/doc/en/docinfo.html
-	$(INSTALL_DATA) $(srcdir)/download.html $(prefix)/share/scribus/doc/en/download.html
-	$(INSTALL_DATA) $(srcdir)/faq1.html $(prefix)/share/scribus/doc/en/faq1.html
-	$(INSTALL_DATA) $(srcdir)/faq2.html $(prefix)/share/scribus/doc/en/faq2.html
-	$(INSTALL_DATA) $(srcdir)/faq3.html $(prefix)/share/scribus/doc/en/faq3.html
-	$(INSTALL_DATA) $(srcdir)/fonts1.html $(prefix)/share/scribus/doc/en/fonts1.html
-	$(INSTALL_DATA) $(srcdir)/fonts2.html $(prefix)/share/scribus/doc/en/fonts2.html
-	$(INSTALL_DATA) $(srcdir)/fonts3.html $(prefix)/share/scribus/doc/en/fonts3.html
-	$(INSTALL_DATA) $(srcdir)/fonts4.html $(prefix)/share/scribus/doc/en/fonts4.html
-	$(INSTALL_DATA) $(srcdir)/fonts5.html $(prefix)/share/scribus/doc/en/fonts5.html
-	$(INSTALL_DATA) $(srcdir)/fonts-win32.html $(prefix)/share/scribus/doc/en/fonts-win32.html
-	$(INSTALL_DATA) $(srcdir)/gettexthowto.html $(prefix)/share/scribus/doc/en/gettexthowto.html
-	$(INSTALL_DATA) $(srcdir)/gsfont.html $(prefix)/share/scribus/doc/en/gsfont.html
-	$(INSTALL_DATA) $(srcdir)/hyphenator.html $(prefix)/share/scribus/doc/en/hyphenator.html
-	$(INSTALL_DATA) $(srcdir)/importhints.html $(prefix)/share/scribus/doc/en/importhints.html
-	$(INSTALL_DATA) $(srcdir)/importhints1.html $(prefix)/share/scribus/doc/en/importhints1.html
-	$(INSTALL_DATA) $(srcdir)/importhints2.html $(prefix)/share/scribus/doc/en/importhints2.html
-	$(INSTALL_DATA) $(srcdir)/importhints3.html $(prefix)/share/scribus/doc/en/importhints3.html
-	$(INSTALL_DATA) $(srcdir)/importhints4.html $(prefix)/share/scribus/doc/en/importhints4.html
-	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/share/scribus/doc/en/index.html
-	$(INSTALL_DATA) $(srcdir)/install1.html $(prefix)/share/scribus/doc/en/install1.html
-	$(INSTALL_DATA) $(srcdir)/install2.html $(prefix)/share/scribus/doc/en/install2.html
-	$(INSTALL_DATA) $(srcdir)/install3.html $(prefix)/share/scribus/doc/en/install3.html
-	$(INSTALL_DATA) $(srcdir)/install.html $(prefix)/share/scribus/doc/en/install.html
-	$(INSTALL_DATA) $(srcdir)/install-dpkg.html $(prefix)/share/scribus/doc/en/install-dpkg.html
-	$(INSTALL_DATA) $(srcdir)/intro.html $(prefix)/share/scribus/doc/en/intro.html
-	$(INSTALL_DATA) $(srcdir)/irc.html $(prefix)/share/scribus/doc/en/irc.html
-	$(INSTALL_DATA) $(srcdir)/javascriptpdf.html $(prefix)/share/scribus/doc/en/javascriptpdf.html
-	$(INSTALL_DATA) $(srcdir)/keys.html $(prefix)/share/scribus/doc/en/keys.html
-	$(INSTALL_DATA) $(srcdir)/lipsum.html $(prefix)/share/scribus/doc/en/lipsum.html
-	$(INSTALL_DATA) $(srcdir)/machints1.html $(prefix)/share/scribus/doc/en/machints1.html
-	$(INSTALL_DATA) $(srcdir)/machints2.html $(prefix)/share/scribus/doc/en/machints2.html
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/en/menu.xml
-	$(INSTALL_DATA) $(srcdir)/moncal.html $(prefix)/share/scribus/doc/en/moncal.html
-	$(INSTALL_DATA) $(srcdir)/mouse.html $(prefix)/share/scribus/doc/en/mouse.html
-	$(INSTALL_DATA) $(srcdir)/pagetemplate1.html $(prefix)/share/scribus/doc/en/pagetemplate1.html
-	$(INSTALL_DATA) $(srcdir)/parallel-install.html $(prefix)/share/scribus/doc/en/parallel-install.html
-	$(INSTALL_DATA) $(srcdir)/pdflavor.html $(prefix)/share/scribus/doc/en/pdflavor.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport1.html $(prefix)/share/scribus/doc/en/pdfexport1.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport2.html $(prefix)/share/scribus/doc/en/pdfexport2.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport3.html $(prefix)/share/scribus/doc/en/pdfexport3.html
-	$(INSTALL_DATA) $(srcdir)/pdfexport4.html $(prefix)/share/scribus/doc/en/pdfexport4.html
-	$(INSTALL_DATA) $(srcdir)/pdfx3.html $(prefix)/share/scribus/doc/en/pdfx3.html
-	$(INSTALL_DATA) $(srcdir)/plugin_howto.html $(prefix)/share/scribus/doc/en/plugin_howto.html
-	$(INSTALL_DATA) $(srcdir)/prepress.html $(prefix)/share/scribus/doc/en/prepress.html
-	$(INSTALL_DATA) $(srcdir)/print1.html $(prefix)/share/scribus/doc/en/print1.html
-	$(INSTALL_DATA) $(srcdir)/print2.html $(prefix)/share/scribus/doc/en/print2.html
-	$(INSTALL_DATA) $(srcdir)/print3.html $(prefix)/share/scribus/doc/en/print3.html
-	$(INSTALL_DATA) $(srcdir)/readme.html $(prefix)/share/scribus/doc/en/readme.html
-	$(INSTALL_DATA) $(srcdir)/readme-win32.html $(prefix)/share/scribus/doc/en/readme-win32.html
-	$(INSTALL_DATA) $(srcdir)/resources.html $(prefix)/share/scribus/doc/en/resources.html
-	$(INSTALL_DATA) $(srcdir)/scprinters.html $(prefix)/share/scribus/doc/en/scprinters.html
-	$(INSTALL_DATA) $(srcdir)/scribuscopyright.html $(prefix)/share/scribus/doc/en/scribuscopyright.html
-	$(INSTALL_DATA) $(srcdir)/scribusfileformat.html $(prefix)/share/scribus/doc/en/scribusfileformat.html
-	$(INSTALL_DATA) $(srcdir)/scribus-svg.html $(prefix)/share/scribus/doc/en/scribus-svg.html
-	$(INSTALL_DATA) $(srcdir)/scripter1.html $(prefix)/share/scribus/doc/en/scripter1.html
-	$(INSTALL_DATA) $(srcdir)/scripter-extensions.html $(prefix)/share/scribus/doc/en/scripter-extensions.html
-	$(INSTALL_DATA) $(srcdir)/scripter-faq.html $(prefix)/share/scribus/doc/en/scripter-faq.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-color.html $(prefix)/share/scribus/doc/en/scripterapi-color.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-constants.html $(prefix)/share/scribus/doc/en/scripterapi-constants.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-dialogs.html $(prefix)/share/scribus/doc/en/scripterapi-dialogs.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-doc.html $(prefix)/share/scribus/doc/en/scripterapi-doc.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-font.html $(prefix)/share/scribus/doc/en/scripterapi-font.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-getobjprop.html $(prefix)/share/scribus/doc/en/scripterapi-getobjprop.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi.html $(prefix)/share/scribus/doc/en/scripterapi.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-layer.html $(prefix)/share/scribus/doc/en/scripterapi-layer.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-manobj.html $(prefix)/share/scribus/doc/en/scripterapi-manobj.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-object.html $(prefix)/share/scribus/doc/en/scripterapi-object.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-page.html $(prefix)/share/scribus/doc/en/scripterapi-page.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-select.html $(prefix)/share/scribus/doc/en/scripterapi-select.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-setobjprop.html $(prefix)/share/scribus/doc/en/scripterapi-setobjprop.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-textframes.html $(prefix)/share/scribus/doc/en/scripterapi-textframes.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-PDFfile.html $(prefix)/share/scribus/doc/en/scripterapi-PDFfile.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-Printer.html $(prefix)/share/scribus/doc/en/scripterapi-Printer.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-ImageExport.html $(prefix)/share/scribus/doc/en/scripterapi-ImageExport.html
-	$(INSTALL_DATA) $(srcdir)/scripterapi-pydoc.html $(prefix)/share/scribus/doc/en/scripterapi-pydoc.html
-	$(INSTALL_DATA) $(srcdir)/settings1.html $(prefix)/share/scribus/doc/en/settings1.html
-	$(INSTALL_DATA) $(srcdir)/specs.html $(prefix)/share/scribus/doc/en/specs.html
-	$(INSTALL_DATA) $(srcdir)/short-words.html $(prefix)/share/scribus/doc/en/short-words.html
-	$(INSTALL_DATA) $(srcdir)/toolbox10.html $(prefix)/share/scribus/doc/en/toolbox10.html
-	$(INSTALL_DATA) $(srcdir)/toolbox11.html $(prefix)/share/scribus/doc/en/toolbox11.html
-	$(INSTALL_DATA) $(srcdir)/toolbox12.html $(prefix)/share/scribus/doc/en/toolbox12.html
-	$(INSTALL_DATA) $(srcdir)/toolbox13.html $(prefix)/share/scribus/doc/en/toolbox13.html
-	$(INSTALL_DATA) $(srcdir)/toolbox1.html $(prefix)/share/scribus/doc/en/toolbox1.html
-	$(INSTALL_DATA) $(srcdir)/toolbox2.html $(prefix)/share/scribus/doc/en/toolbox2.html
-	$(INSTALL_DATA) $(srcdir)/toolbox3.html $(prefix)/share/scribus/doc/en/toolbox3.html
-	$(INSTALL_DATA) $(srcdir)/toolbox4.html $(prefix)/share/scribus/doc/en/toolbox4.html
-	$(INSTALL_DATA) $(srcdir)/toolbox5.html $(prefix)/share/scribus/doc/en/toolbox5.html
-	$(INSTALL_DATA) $(srcdir)/toolbox6.html $(prefix)/share/scribus/doc/en/toolbox6.html
-	$(INSTALL_DATA) $(srcdir)/toolbox7.html $(prefix)/share/scribus/doc/en/toolbox7.html
-	$(INSTALL_DATA) $(srcdir)/toolbox8.html $(prefix)/share/scribus/doc/en/toolbox8.html
-	$(INSTALL_DATA) $(srcdir)/toolbox9.html $(prefix)/share/scribus/doc/en/toolbox9.html
-	$(INSTALL_DATA) $(srcdir)/toolbox.html $(prefix)/share/scribus/doc/en/toolbox.html
-	$(INSTALL_DATA) $(srcdir)/topten.html $(prefix)/share/scribus/doc/en/topten.html
-	$(INSTALL_DATA) $(srcdir)/translation_howto.html $(prefix)/share/scribus/doc/en/translation_howto.html
-	$(INSTALL_DATA) $(srcdir)/pdf_form.html $(prefix)/share/scribus/doc/en/pdf_form.html
-	$(INSTALL_DATA) $(srcdir)/otherinfo.html $(prefix)/share/scribus/doc/en/otherinfo.html
-	$(INSTALL_DATA) $(srcdir)/documentation.html $(prefix)/share/scribus/doc/en/documentation.html
-	$(INSTALL_DATA) $(srcdir)/tutorials.html $(prefix)/share/scribus/doc/en/tutorials.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/
+	$(INSTALL_DATA) $(srcdir)/about1.html $(prefix)/share/doc/scribus-$(VERSION)/en/about1.html
+	$(INSTALL_DATA) $(srcdir)/about2.html $(prefix)/share/doc/scribus-$(VERSION)/en/about2.html
+	$(INSTALL_DATA) $(srcdir)/cms.html $(prefix)/share/doc/scribus-$(VERSION)/en/cms.html
+	$(INSTALL_DATA) $(srcdir)/cms2.html $(prefix)/share/doc/scribus-$(VERSION)/en/cms2.html
+	$(INSTALL_DATA) $(srcdir)/cms3.html $(prefix)/share/doc/scribus-$(VERSION)/en/cms3.html
+	$(INSTALL_DATA) $(srcdir)/cms4.html $(prefix)/share/doc/scribus-$(VERSION)/en/cms4.html
+	$(INSTALL_DATA) $(srcdir)/codingstandards.html $(prefix)/share/doc/scribus-$(VERSION)/en/codingstandards.html
+	$(INSTALL_DATA) $(srcdir)/contributions.html $(prefix)/share/doc/scribus-$(VERSION)/en/contributions.html
+	$(INSTALL_DATA) $(srcdir)/cross-platform.html $(prefix)/share/doc/scribus-$(VERSION)/en/cross-platform.html
+	$(INSTALL_DATA) $(srcdir)/cups.html $(prefix)/share/doc/scribus-$(VERSION)/en/cups.html
+	$(INSTALL_DATA) $(srcdir)/developers.html $(prefix)/share/doc/scribus-$(VERSION)/en/developers.html
+	$(INSTALL_DATA) $(srcdir)/doccopyright.html $(prefix)/share/doc/scribus-$(VERSION)/en/doccopyright.html
+	$(INSTALL_DATA) $(srcdir)/docinfo.html $(prefix)/share/doc/scribus-$(VERSION)/en/docinfo.html
+	$(INSTALL_DATA) $(srcdir)/download.html $(prefix)/share/doc/scribus-$(VERSION)/en/download.html
+	$(INSTALL_DATA) $(srcdir)/faq1.html $(prefix)/share/doc/scribus-$(VERSION)/en/faq1.html
+	$(INSTALL_DATA) $(srcdir)/faq2.html $(prefix)/share/doc/scribus-$(VERSION)/en/faq2.html
+	$(INSTALL_DATA) $(srcdir)/faq3.html $(prefix)/share/doc/scribus-$(VERSION)/en/faq3.html
+	$(INSTALL_DATA) $(srcdir)/fonts1.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts1.html
+	$(INSTALL_DATA) $(srcdir)/fonts2.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts2.html
+	$(INSTALL_DATA) $(srcdir)/fonts3.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts3.html
+	$(INSTALL_DATA) $(srcdir)/fonts4.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts4.html
+	$(INSTALL_DATA) $(srcdir)/fonts5.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts5.html
+	$(INSTALL_DATA) $(srcdir)/fonts-win32.html $(prefix)/share/doc/scribus-$(VERSION)/en/fonts-win32.html
+	$(INSTALL_DATA) $(srcdir)/gettexthowto.html $(prefix)/share/doc/scribus-$(VERSION)/en/gettexthowto.html
+	$(INSTALL_DATA) $(srcdir)/gsfont.html $(prefix)/share/doc/scribus-$(VERSION)/en/gsfont.html
+	$(INSTALL_DATA) $(srcdir)/hyphenator.html $(prefix)/share/doc/scribus-$(VERSION)/en/hyphenator.html
+	$(INSTALL_DATA) $(srcdir)/importhints.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints.html
+	$(INSTALL_DATA) $(srcdir)/importhints1.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints1.html
+	$(INSTALL_DATA) $(srcdir)/importhints2.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints2.html
+	$(INSTALL_DATA) $(srcdir)/importhints3.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints3.html
+	$(INSTALL_DATA) $(srcdir)/importhints4.html $(prefix)/share/doc/scribus-$(VERSION)/en/importhints4.html
+	$(INSTALL_DATA) $(srcdir)/index.html $(prefix)/share/doc/scribus-$(VERSION)/en/index.html
+	$(INSTALL_DATA) $(srcdir)/install1.html $(prefix)/share/doc/scribus-$(VERSION)/en/install1.html
+	$(INSTALL_DATA) $(srcdir)/install2.html $(prefix)/share/doc/scribus-$(VERSION)/en/install2.html
+	$(INSTALL_DATA) $(srcdir)/install3.html $(prefix)/share/doc/scribus-$(VERSION)/en/install3.html
+	$(INSTALL_DATA) $(srcdir)/install.html $(prefix)/share/doc/scribus-$(VERSION)/en/install.html
+	$(INSTALL_DATA) $(srcdir)/install-dpkg.html $(prefix)/share/doc/scribus-$(VERSION)/en/install-dpkg.html
+	$(INSTALL_DATA) $(srcdir)/intro.html $(prefix)/share/doc/scribus-$(VERSION)/en/intro.html
+	$(INSTALL_DATA) $(srcdir)/irc.html $(prefix)/share/doc/scribus-$(VERSION)/en/irc.html
+	$(INSTALL_DATA) $(srcdir)/javascriptpdf.html $(prefix)/share/doc/scribus-$(VERSION)/en/javascriptpdf.html
+	$(INSTALL_DATA) $(srcdir)/keys.html $(prefix)/share/doc/scribus-$(VERSION)/en/keys.html
+	$(INSTALL_DATA) $(srcdir)/lipsum.html $(prefix)/share/doc/scribus-$(VERSION)/en/lipsum.html
+	$(INSTALL_DATA) $(srcdir)/machints1.html $(prefix)/share/doc/scribus-$(VERSION)/en/machints1.html
+	$(INSTALL_DATA) $(srcdir)/machints2.html $(prefix)/share/doc/scribus-$(VERSION)/en/machints2.html
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/en/menu.xml
+	$(INSTALL_DATA) $(srcdir)/moncal.html $(prefix)/share/doc/scribus-$(VERSION)/en/moncal.html
+	$(INSTALL_DATA) $(srcdir)/mouse.html $(prefix)/share/doc/scribus-$(VERSION)/en/mouse.html
+	$(INSTALL_DATA) $(srcdir)/pagetemplate1.html $(prefix)/share/doc/scribus-$(VERSION)/en/pagetemplate1.html
+	$(INSTALL_DATA) $(srcdir)/parallel-install.html $(prefix)/share/doc/scribus-$(VERSION)/en/parallel-install.html
+	$(INSTALL_DATA) $(srcdir)/pdflavor.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdflavor.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport1.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport1.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport2.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport2.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport3.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport3.html
+	$(INSTALL_DATA) $(srcdir)/pdfexport4.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport4.html
+	$(INSTALL_DATA) $(srcdir)/pdfx3.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdfx3.html
+	$(INSTALL_DATA) $(srcdir)/plugin_howto.html $(prefix)/share/doc/scribus-$(VERSION)/en/plugin_howto.html
+	$(INSTALL_DATA) $(srcdir)/prepress.html $(prefix)/share/doc/scribus-$(VERSION)/en/prepress.html
+	$(INSTALL_DATA) $(srcdir)/print1.html $(prefix)/share/doc/scribus-$(VERSION)/en/print1.html
+	$(INSTALL_DATA) $(srcdir)/print2.html $(prefix)/share/doc/scribus-$(VERSION)/en/print2.html
+	$(INSTALL_DATA) $(srcdir)/print3.html $(prefix)/share/doc/scribus-$(VERSION)/en/print3.html
+	$(INSTALL_DATA) $(srcdir)/readme.html $(prefix)/share/doc/scribus-$(VERSION)/en/readme.html
+	$(INSTALL_DATA) $(srcdir)/readme-win32.html $(prefix)/share/doc/scribus-$(VERSION)/en/readme-win32.html
+	$(INSTALL_DATA) $(srcdir)/resources.html $(prefix)/share/doc/scribus-$(VERSION)/en/resources.html
+	$(INSTALL_DATA) $(srcdir)/scprinters.html $(prefix)/share/doc/scribus-$(VERSION)/en/scprinters.html
+	$(INSTALL_DATA) $(srcdir)/scribuscopyright.html $(prefix)/share/doc/scribus-$(VERSION)/en/scribuscopyright.html
+	$(INSTALL_DATA) $(srcdir)/scribusfileformat.html $(prefix)/share/doc/scribus-$(VERSION)/en/scribusfileformat.html
+	$(INSTALL_DATA) $(srcdir)/scribus-svg.html $(prefix)/share/doc/scribus-$(VERSION)/en/scribus-svg.html
+	$(INSTALL_DATA) $(srcdir)/scripter1.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripter1.html
+	$(INSTALL_DATA) $(srcdir)/scripter-extensions.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripter-extensions.html
+	$(INSTALL_DATA) $(srcdir)/scripter-faq.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripter-faq.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-color.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-color.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-constants.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-constants.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-dialogs.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-dialogs.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-doc.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-doc.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-font.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-font.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-getobjprop.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-getobjprop.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-layer.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-layer.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-manobj.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-manobj.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-object.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-object.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-page.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-page.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-select.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-select.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-setobjprop.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-setobjprop.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-textframes.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-textframes.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-PDFfile.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-PDFfile.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-Printer.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-Printer.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-ImageExport.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-ImageExport.html
+	$(INSTALL_DATA) $(srcdir)/scripterapi-pydoc.html $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-pydoc.html
+	$(INSTALL_DATA) $(srcdir)/settings1.html $(prefix)/share/doc/scribus-$(VERSION)/en/settings1.html
+	$(INSTALL_DATA) $(srcdir)/specs.html $(prefix)/share/doc/scribus-$(VERSION)/en/specs.html
+	$(INSTALL_DATA) $(srcdir)/short-words.html $(prefix)/share/doc/scribus-$(VERSION)/en/short-words.html
+	$(INSTALL_DATA) $(srcdir)/toolbox10.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox10.html
+	$(INSTALL_DATA) $(srcdir)/toolbox11.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox11.html
+	$(INSTALL_DATA) $(srcdir)/toolbox12.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox12.html
+	$(INSTALL_DATA) $(srcdir)/toolbox13.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox13.html
+	$(INSTALL_DATA) $(srcdir)/toolbox1.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox1.html
+	$(INSTALL_DATA) $(srcdir)/toolbox2.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox2.html
+	$(INSTALL_DATA) $(srcdir)/toolbox3.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox3.html
+	$(INSTALL_DATA) $(srcdir)/toolbox4.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox4.html
+	$(INSTALL_DATA) $(srcdir)/toolbox5.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox5.html
+	$(INSTALL_DATA) $(srcdir)/toolbox6.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox6.html
+	$(INSTALL_DATA) $(srcdir)/toolbox7.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox7.html
+	$(INSTALL_DATA) $(srcdir)/toolbox8.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox8.html
+	$(INSTALL_DATA) $(srcdir)/toolbox9.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox9.html
+	$(INSTALL_DATA) $(srcdir)/toolbox.html $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox.html
+	$(INSTALL_DATA) $(srcdir)/topten.html $(prefix)/share/doc/scribus-$(VERSION)/en/topten.html
+	$(INSTALL_DATA) $(srcdir)/translation_howto.html $(prefix)/share/doc/scribus-$(VERSION)/en/translation_howto.html
+	$(INSTALL_DATA) $(srcdir)/pdf_form.html $(prefix)/share/doc/scribus-$(VERSION)/en/pdf_form.html
+	$(INSTALL_DATA) $(srcdir)/otherinfo.html $(prefix)/share/doc/scribus-$(VERSION)/en/otherinfo.html
+	$(INSTALL_DATA) $(srcdir)/documentation.html $(prefix)/share/doc/scribus-$(VERSION)/en/documentation.html
+	$(INSTALL_DATA) $(srcdir)/tutorials.html $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials.html
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/en/about1.html
-	-rm -f $(prefix)/share/scribus/doc/en/about2.html
-	-rm -f $(prefix)/share/scribus/doc/en/cms.html
-	-rm -f $(prefix)/share/scribus/doc/en/cms2.html
-	-rm -f $(prefix)/share/scribus/doc/en/cms3.html
-	-rm -f $(prefix)/share/scribus/doc/en/cms4.html
-	-rm -f $(prefix)/share/scribus/doc/en/codingstandards.html
-	-rm -f $(prefix)/share/scribus/doc/en/contributions.html
-	-rm -f $(prefix)/share/scribus/doc/en/cross-platform.html
-	-rm -f $(prefix)/share/scribus/doc/en/cups.html
-	-rm -f $(prefix)/share/scribus/doc/en/developers.html
-	-rm -f $(prefix)/share/scribus/doc/en/doccopyright.html
-	-rm -f $(prefix)/share/scribus/doc/en/docinfo.html
-	-rm -f $(prefix)/share/scribus/doc/en/download.html
-	-rm -f $(prefix)/share/scribus/doc/en/install-dpkg.html
-	-rm -f $(prefix)/share/scribus/doc/en/faq1.html
-	-rm -f $(prefix)/share/scribus/doc/en/faq2.html
-	-rm -f $(prefix)/share/scribus/doc/en/faq3.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts1.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts2.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts3.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts4.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts5.html
-	-rm -f $(prefix)/share/scribus/doc/en/fonts-win32.html
-	-rm -f $(prefix)/share/scribus/doc/en/gettexthowto.html
-	-rm -f $(prefix)/share/scribus/doc/en/gsfont.html
-	-rm -f $(prefix)/share/scribus/doc/en/hyphenator.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints1.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints2.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints.html
-	-rm -f $(prefix)/share/scribus/doc/en/importhints4.html
-	-rm -f $(prefix)/share/scribus/doc/en/index.html
-	-rm -f $(prefix)/share/scribus/doc/en/install1.html
-	-rm -f $(prefix)/share/scribus/doc/en/install2.html
-	-rm -f $(prefix)/share/scribus/doc/en/install3.html
-	-rm -f $(prefix)/share/scribus/doc/en/install.html
-	-rm -f $(prefix)/share/scribus/doc/en/intro.html
-	-rm -f $(prefix)/share/scribus/doc/en/irc.html
-	-rm -f $(prefix)/share/scribus/doc/en/javascriptpdf.html
-	-rm -f $(prefix)/share/scribus/doc/en/keys.html
-	-rm -f $(prefix)/share/scribus/doc/en/lipsum.html
-	-rm -f $(prefix)/share/scribus/doc/en/machints1.html
-	-rm -f $(prefix)/share/scribus/doc/en/machints2.html
-	-rm -f $(prefix)/share/scribus/doc/en/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/en/moncal.html
-	-rm -f $(prefix)/share/scribus/doc/en/mouse.html
-	-rm -f $(prefix)/share/scribus/doc/en/pagetemplate1.htm
-	-rm -f $(prefix)/share/scribus/doc/en/parallel-install.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdflavor.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfexport1.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfexport2.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfexport3.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfexport4.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdfx3.html
-	-rm -f $(prefix)/share/scribus/doc/en/plugin_howto.html
-	-rm -f $(prefix)/share/scribus/doc/en/prepress.html
-	-rm -f $(prefix)/share/scribus/doc/en/print1.html
-	-rm -f $(prefix)/share/scribus/doc/en/print2.html
-	-rm -f $(prefix)/share/scribus/doc/en/print3.html
-	-rm -f $(prefix)/share/scribus/doc/en/readme.html
-	-rm -f $(prefix)/share/scribus/doc/en/readme-win32.html
-	-rm -f $(prefix)/share/scribus/doc/en/resources.html
-	-rm -f $(prefix)/share/scribus/doc/en/scprinters.html
-	-rm -f $(prefix)/share/scribus/doc/en/scribuscopyright.html
-	-rm -f $(prefix)/share/scribus/doc/en/scribusfileformat.html
-	-rm -f $(prefix)/share/scribus/doc/en/scribus-svg.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripter1.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripter-extensions.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripter-faq.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-color.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-constants.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-dialogs.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-doc.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-font.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-getobjprop.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-layer.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-manobj.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-object.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-page.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-select.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-setobjprop.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-textframes.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-PDFfile.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-Printer.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-ImageExport.html
-	-rm -f $(prefix)/share/scribus/doc/en/scripterapi-pydoc.html
-	-rm -f $(prefix)/share/scribus/doc/en/settings1.html
-	-rm -f $(prefix)/share/scribus/doc/en/specs.html
-	-rm -f $(prefix)/share/scribus/doc/en/short-words.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox10.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox11.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox12.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox13.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox1.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox2.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox3.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox4.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox5.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox6.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox7.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox8.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox9.html
-	-rm -f $(prefix)/share/scribus/doc/en/toolbox.html
-	-rm -f $(prefix)/share/scribus/doc/en/topten.html
-	-rm -f $(prefix)/share/scribus/doc/en/translation_howto.html
-	-rm -f $(prefix)/share/scribus/doc/en/pdf_form.html
-	-rm -f $(prefix)/share/scribus/doc/en/otherinfo.html
-	-rm -f $(prefix)/share/scribus/doc/en/documentation.html
-	-rm -f $(prefix)/share/scribus/doc/en/tutorials.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/about1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/about2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cms.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cms2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cms3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cms4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/codingstandards.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/contributions.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cross-platform.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/cups.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/developers.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/doccopyright.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/docinfo.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/download.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install-dpkg.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/faq1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/faq2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/faq3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts5.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/fonts-win32.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/gettexthowto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/gsfont.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/hyphenator.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/importhints4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/index.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/install.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/intro.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/irc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/javascriptpdf.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/keys.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/lipsum.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/machints1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/machints2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/moncal.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/mouse.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pagetemplate1.htm
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/parallel-install.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdflavor.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfexport4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdfx3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/plugin_howto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/prepress.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/print1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/print2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/print3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/readme.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/readme-win32.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/resources.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scprinters.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scribuscopyright.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scribusfileformat.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scribus-svg.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripter1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripter-extensions.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripter-faq.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-color.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-constants.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-dialogs.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-doc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-font.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-getobjprop.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-layer.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-manobj.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-object.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-page.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-select.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-setobjprop.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-textframes.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-PDFfile.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-Printer.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-ImageExport.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/scripterapi-pydoc.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/settings1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/specs.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/short-words.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox10.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox11.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox12.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox13.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox1.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox2.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox3.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox4.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox5.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox6.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox7.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox8.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox9.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/toolbox.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/topten.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/translation_howto.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/pdf_form.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/otherinfo.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/documentation.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials.html
 
diff -Naur Scribus/scribus/doc/en/tutorials/short-words/Makefile.am Scribus-fhs/scribus/doc/en/tutorials/short-words/Makefile.am
--- Scribus/scribus/doc/en/tutorials/short-words/Makefile.am	2005-01-26 21:48:52.000000000 +0100
+++ Scribus-fhs/scribus/doc/en/tutorials/short-words/Makefile.am	2006-03-27 00:12:10.105492250 +0200
@@ -1,24 +1,24 @@
 EXTRA_DIST = menu.xml after_short_words.png before_short_words.png dialog.png menu.png short-words-manual.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/menu.xml
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/after_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/before_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/dialog.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/menu.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/short-words-manual.html
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/menu.xml
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/after_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/before_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/dialog.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/menu.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/short-words-manual.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/after_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/before_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/dialog.png
-	-rm -f $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/menu.png
-	-rm -f $(prefix)/share/scribus/doc/en/tutorials/scribus-short-words/short-words-manual.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/after_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/before_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/dialog.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/menu.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/en/tutorials/scribus-short-words/short-words-manual.html
diff -Naur Scribus/scribus/doc/fr/tutorials/short-words/Makefile.am Scribus-fhs/scribus/doc/fr/tutorials/short-words/Makefile.am
--- Scribus/scribus/doc/fr/tutorials/short-words/Makefile.am	2005-01-26 21:51:27.000000000 +0100
+++ Scribus-fhs/scribus/doc/fr/tutorials/short-words/Makefile.am	2006-03-27 00:12:10.113492750 +0200
@@ -1,24 +1,24 @@
 EXTRA_DIST = menu.xml after_short_words.png before_short_words.png dialog.png menu.png short-words-manual.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/menu.xml
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/after_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/before_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/dialog.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/menu.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/short-words-manual.html
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/menu.xml
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/after_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/before_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/dialog.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/menu.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/short-words-manual.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/after_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/before_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/dialog.png
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/menu.png
-	-rm -f $(prefix)/share/scribus/doc/fr/tutorials/scribus-short-words/short-words-manual.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/after_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/before_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/dialog.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/menu.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/fr/tutorials/scribus-short-words/short-words-manual.html
diff -Naur Scribus/scribus/doc/pl/tutorials/short-words/Makefile.am Scribus-fhs/scribus/doc/pl/tutorials/short-words/Makefile.am
--- Scribus/scribus/doc/pl/tutorials/short-words/Makefile.am	2005-01-26 21:56:15.000000000 +0100
+++ Scribus-fhs/scribus/doc/pl/tutorials/short-words/Makefile.am	2006-03-27 00:12:10.113492750 +0200
@@ -1,24 +1,24 @@
 EXTRA_DIST = menu.xml after_short_words.png before_short_words.png dialog.png menu.png short-words-manual.html
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/menu.xml
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/after_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/before_short_words.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/dialog.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/menu.png
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
-	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/short-words-manual.html
-	$(mkinstalldirs) $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.xml $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/menu.xml
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/after_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/after_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/before_short_words.png $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/before_short_words.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/dialog.png $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/dialog.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/menu.png $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/menu.png
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
+	$(INSTALL_DATA) $(srcdir)/short-words-manual.html $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/short-words-manual.html
+	$(mkinstalldirs) $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/
 
 uninstall-local:
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/menu.xml
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/after_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/before_short_words.png
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/dialog.png
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/menu.png
-	-rm -f $(prefix)/share/scribus/doc/pl/tutorials/scribus-short-words/short-words-manual.html
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/menu.xml
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/after_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/before_short_words.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/dialog.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/menu.png
+	-rm -f $(prefix)/share/doc/scribus-$(VERSION)/pl/tutorials/scribus-short-words/short-words-manual.html
diff -Naur Scribus/scribus/keysets/Makefile.am Scribus-fhs/scribus/keysets/Makefile.am
--- Scribus/scribus/keysets/Makefile.am	2005-12-28 16:09:58.000000000 +0100
+++ Scribus-fhs/scribus/keysets/Makefile.am	2006-03-27 00:12:10.121493250 +0200
@@ -8,7 +8,7 @@
 	-rm -f $(libdir)/scribus/keysets/scribus13.ksxml
 
 AM_CPPFLAGS = \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/Makefile.am Scribus-fhs/scribus/Makefile.am
--- Scribus/scribus/Makefile.am	2006-03-24 01:38:06.000000000 +0100
+++ Scribus-fhs/scribus/Makefile.am	2006-03-27 00:12:10.097491750 +0200
@@ -631,7 +631,7 @@
 KDE_OPTIONS = qtonly
 
 AM_CPPFLAGS = \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/colorwheel/Makefile.am Scribus-fhs/scribus/plugins/colorwheel/Makefile.am
--- Scribus/scribus/plugins/colorwheel/Makefile.am	2005-12-28 16:09:58.000000000 +0100
+++ Scribus-fhs/scribus/plugins/colorwheel/Makefile.am	2006-03-27 00:12:10.125493500 +0200
@@ -15,7 +15,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/fileloader/oodraw/Makefile.am Scribus-fhs/scribus/plugins/fileloader/oodraw/Makefile.am
--- Scribus/scribus/plugins/fileloader/oodraw/Makefile.am	2005-12-28 16:09:59.000000000 +0100
+++ Scribus-fhs/scribus/plugins/fileloader/oodraw/Makefile.am	2006-03-27 00:12:10.125493500 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/fontpreview/Makefile.am Scribus-fhs/scribus/plugins/fontpreview/Makefile.am
--- Scribus/scribus/plugins/fontpreview/Makefile.am	2006-02-03 19:17:35.000000000 +0100
+++ Scribus-fhs/scribus/plugins/fontpreview/Makefile.am	2006-03-27 00:12:10.125493500 +0200
@@ -15,7 +15,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/csvim/Makefile.am Scribus-fhs/scribus/plugins/gettext/csvim/Makefile.am
--- Scribus/scribus/plugins/gettext/csvim/Makefile.am	2005-12-28 16:09:59.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/csvim/Makefile.am	2006-03-27 00:12:10.129493750 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/docim/Makefile.am Scribus-fhs/scribus/plugins/gettext/docim/Makefile.am
--- Scribus/scribus/plugins/gettext/docim/Makefile.am	2006-02-17 11:36:50.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/docim/Makefile.am	2006-03-27 00:12:10.129493750 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/htmlim/Makefile.am Scribus-fhs/scribus/plugins/gettext/htmlim/Makefile.am
--- Scribus/scribus/plugins/gettext/htmlim/Makefile.am	2005-12-28 16:09:59.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/htmlim/Makefile.am	2006-03-27 00:12:10.129493750 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/odtim/Makefile.am Scribus-fhs/scribus/plugins/gettext/odtim/Makefile.am
--- Scribus/scribus/plugins/gettext/odtim/Makefile.am	2005-12-28 16:09:59.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/odtim/Makefile.am	2006-03-27 00:12:10.129493750 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/pdbim/Makefile.am Scribus-fhs/scribus/plugins/gettext/pdbim/Makefile.am
--- Scribus/scribus/plugins/gettext/pdbim/Makefile.am	2006-02-13 18:25:07.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/pdbim/Makefile.am	2006-03-27 00:12:10.129493750 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/sxwim/Makefile.am Scribus-fhs/scribus/plugins/gettext/sxwim/Makefile.am
--- Scribus/scribus/plugins/gettext/sxwim/Makefile.am	2005-12-28 16:09:59.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/sxwim/Makefile.am	2006-03-27 00:12:10.129493750 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/textfilter/Makefile.am Scribus-fhs/scribus/plugins/gettext/textfilter/Makefile.am
--- Scribus/scribus/plugins/gettext/textfilter/Makefile.am	2005-12-28 16:10:00.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/textfilter/Makefile.am	2006-03-27 00:12:10.129493750 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/gettext/txtim/Makefile.am Scribus-fhs/scribus/plugins/gettext/txtim/Makefile.am
--- Scribus/scribus/plugins/gettext/txtim/Makefile.am	2005-12-28 16:10:02.000000000 +0100
+++ Scribus-fhs/scribus/plugins/gettext/txtim/Makefile.am	2006-03-27 00:12:10.129493750 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/newfromtemplateplugin/Makefile.am Scribus-fhs/scribus/plugins/newfromtemplateplugin/Makefile.am
--- Scribus/scribus/plugins/newfromtemplateplugin/Makefile.am	2005-12-28 16:10:02.000000000 +0100
+++ Scribus-fhs/scribus/plugins/newfromtemplateplugin/Makefile.am	2006-03-27 00:12:10.133494000 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/pixmapexport/Makefile.am Scribus-fhs/scribus/plugins/pixmapexport/Makefile.am
--- Scribus/scribus/plugins/pixmapexport/Makefile.am	2005-12-28 16:10:02.000000000 +0100
+++ Scribus-fhs/scribus/plugins/pixmapexport/Makefile.am	2006-03-27 00:12:10.133494000 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/psimport/Makefile.am Scribus-fhs/scribus/plugins/psimport/Makefile.am
--- Scribus/scribus/plugins/psimport/Makefile.am	2005-12-28 16:10:02.000000000 +0100
+++ Scribus-fhs/scribus/plugins/psimport/Makefile.am	2006-03-27 00:12:10.133494000 +0200
@@ -24,7 +24,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/saveastemplateplugin/Makefile.am Scribus-fhs/scribus/plugins/saveastemplateplugin/Makefile.am
--- Scribus/scribus/plugins/saveastemplateplugin/Makefile.am	2005-12-28 16:10:03.000000000 +0100
+++ Scribus-fhs/scribus/plugins/saveastemplateplugin/Makefile.am	2006-03-27 00:12:10.133494000 +0200
@@ -17,7 +17,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/scriptplugin/Makefile.am Scribus-fhs/scribus/plugins/scriptplugin/Makefile.am
--- Scribus/scribus/plugins/scriptplugin/Makefile.am	2006-01-07 23:25:38.000000000 +0100
+++ Scribus-fhs/scribus/plugins/scriptplugin/Makefile.am	2006-03-27 00:12:10.133494000 +0200
@@ -65,7 +65,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus $(PYTHONINC) \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/scriptplugin/scripter2/Makefile.am Scribus-fhs/scribus/plugins/scriptplugin/scripter2/Makefile.am
--- Scribus/scribus/plugins/scriptplugin/scripter2/Makefile.am	2005-12-28 16:10:03.000000000 +0100
+++ Scribus-fhs/scribus/plugins/scriptplugin/scripter2/Makefile.am	2006-03-27 00:12:10.133494000 +0200
@@ -50,7 +50,7 @@
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus $(PYTHONINC) \
     -I$(top_builddir)/scribus/plugins/scriptplugin \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/short-words/Makefile.am Scribus-fhs/scribus/plugins/short-words/Makefile.am
--- Scribus/scribus/plugins/short-words/Makefile.am	2005-12-28 16:10:03.000000000 +0100
+++ Scribus-fhs/scribus/plugins/short-words/Makefile.am	2006-03-27 00:12:10.137494250 +0200
@@ -16,7 +16,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/svgexplugin/Makefile.am Scribus-fhs/scribus/plugins/svgexplugin/Makefile.am
--- Scribus/scribus/plugins/svgexplugin/Makefile.am	2005-12-28 16:10:04.000000000 +0100
+++ Scribus-fhs/scribus/plugins/svgexplugin/Makefile.am	2006-03-27 00:12:10.137494250 +0200
@@ -10,7 +10,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/plugins/svgimplugin/Makefile.am Scribus-fhs/scribus/plugins/svgimplugin/Makefile.am
--- Scribus/scribus/plugins/svgimplugin/Makefile.am	2005-12-28 16:10:04.000000000 +0100
+++ Scribus-fhs/scribus/plugins/svgimplugin/Makefile.am	2006-03-27 00:12:10.137494250 +0200
@@ -10,7 +10,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
diff -Naur Scribus/scribus/text/Makefile.am Scribus-fhs/scribus/text/Makefile.am
--- Scribus/scribus/text/Makefile.am	2006-02-19 05:08:09.000000000 +0100
+++ Scribus-fhs/scribus/text/Makefile.am	2006-03-27 00:12:10.157495500 +0200
@@ -13,7 +13,7 @@
 
 AM_CPPFLAGS = \
     -I$(top_builddir)/scribus \
-    -DDOCDIR=\"$(datadir)/scribus/doc/\" \
+    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
     -DICONDIR=\"$(datadir)/scribus/icons/\" \
     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \
scribus-1.3-fhs.diff (110,278 bytes)   

hanno

2006-03-26 22:21

reporter   ~0009483

Patches attached, this little sed-line helped me:

sed -i \
-e 's:$(prefix)/share/scribus/doc:$(prefix)/share/doc/scribus-$(VERSION):g' \
-e 's:$(datadir)/scribus/doc:$(datadir)/doc/scribus-$(VERSION):g' \
`find|grep Makefile.am`

cbradney

2006-03-29 12:41

administrator   ~0009555

1.3.x stuff committed

Issue History

Date Modified Username Field Change
2006-03-26 21:15 plinnell New Issue
2006-03-26 21:16 plinnell Status new => assigned
2006-03-26 21:16 plinnell Assigned To => plinnell
2006-03-26 21:16 plinnell Note Added: 0009481
2006-03-26 22:20 hanno File Added: scribus-1.2-fhs.diff
2006-03-26 22:20 hanno File Added: scribus-1.3-fhs.diff
2006-03-26 22:21 hanno Note Added: 0009483
2006-03-29 08:44 cbradney Product Version 1.3.4cvs => 1.3.3.1cvs
2006-03-29 12:41 cbradney Note Added: 0009555
2006-03-29 21:27 cbradney Assigned To plinnell => cbradney
2006-03-29 21:28 cbradney Status assigned => resolved
2006-03-29 21:28 cbradney Fixed in Version => 1.2.5cvs
2006-03-29 21:28 cbradney Resolution open => fixed
2006-03-29 22:36 cbradney Status resolved => closed