- version up to 0.10, removed patch already in mainstream

[packages/geany.git] / geany-doc_dir.patch

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 @@
 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; \
 	  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
-
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 @@
 	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/");
 #endif