diff -aurN geany-0.8.orig/doc/Makefile.am geany-0.8/doc/Makefile.am
--- geany-0.8.orig/doc/Makefile.am 2006-07-18 14:28:04.000000000 +0200
+++ geany-0.8/doc/Makefile.am 2006-08-12 00:46:43.159723018 +0200
-@@ -1,5 +1,5 @@
+@@ -1,3 +1,3 @@
man_MANS=geany.1
-DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@
+DOCDIR = $(DESTDIR)/$(datadir)/@PACKAGE@/doc
- HTML_FILES = html/*.html geany.css
- IMAGE_FILES = images/*.jpg
- EXTRA_DIST = geany.css geany.xsl make_webable.sh geany.txt geany_gpl.docbook geany.1 \
-@@ -45,12 +45,3 @@
- $(INSTALL_DATA) $(srcdir)/$$file $(DOCDIR)/html/images/$$basefile; \
+ IMAGE_FILES = images/*.png
+@@ -45,13 +45,3 @@
+ $(INSTALL_DATA) $$file $(DOCDIR)/html/images/$$basefile; \
fi \
done
-- $(INSTALL_DATA) geany.txt $(DOCDIR)/manual.txt
-- $(INSTALL_DATA) ../README $(DOCDIR)
-- $(INSTALL_DATA) ../ChangeLog $(DOCDIR)
-- $(INSTALL_DATA) ../NEWS $(DOCDIR)
-- $(INSTALL_DATA) ../COPYING $(DOCDIR)
-- $(INSTALL_DATA) ../AUTHORS $(DOCDIR)
-- $(INSTALL_DATA) ../TODO $(DOCDIR)
-- $(INSTALL_DATA) ../scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
+- $(INSTALL_DATA) $(srcdir)/geany.html $(DOCDIR)/html/index.html
+- $(INSTALL_DATA) $(srcdir)/geany.txt $(DOCDIR)/manual.txt
+- $(INSTALL_DATA) $(top_srcdir)/README $(DOCDIR)
+- $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DOCDIR)
+- $(INSTALL_DATA) $(top_srcdir)/NEWS $(DOCDIR)
+- $(INSTALL_DATA) $(top_srcdir)/COPYING $(DOCDIR)
+- $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DOCDIR)
+- $(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR)
+- $(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
-
-diff -aurN geany-0.8.orig/src/main.c geany-0.8/src/main.c
---- geany-0.8.orig/src/main.c 2006-08-09 13:06:51.000000000 +0200
-+++ geany-0.8/src/main.c 2006-08-12 00:52:04.532866874 +0200
-@@ -480,7 +480,7 @@
+diff -aurN geany-0.13.orig/src/main.c geany-0.13/src/main.c
+--- geany-0.13.orig/src/main.c 2008-04-11 14:09:34.396089080 +0200
++++ geany-0.13/src/main.c 2008-04-11 14:10:06.920977289 +0200
+@@ -382,7 +382,7 @@ static void setup_paths()
g_free(install_dir);
#else
- data_dir = g_strdup(PACKAGE_DATA_DIR "/" PACKAGE "/"); // e.g. /usr/share/geany
-- doc_dir = g_strdup(PACKAGE_DATA_DIR "/doc/" PACKAGE "/html/");
-+ doc_dir = g_strdup(PACKAGE_DATA_DIR "/" PACKAGE "/doc/html/");
+ data_dir = g_strconcat(GEANY_DATADIR, "/geany/", NULL); // e.g. /usr/share/geany
+- doc_dir = g_strconcat(GEANY_DATADIR, "/doc/geany/html/", NULL);
++ doc_dir = g_strconcat(GEANY_DATADIR, "/doc/geany-", VERSION, "/html/", NULL);
#endif
-
+ // convert path names to locale encoding