From: twittner <twittner@pld-linux.org>
Date: Sun, 20 Apr 2008 10:26:42 +0000 (+0000)
Subject: - removed - make use of `--docdir ./configure' option instead
X-Git-Tag: auto/th/geany-0_14-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgeany.git;a=commitdiff_plain;h=f5d8c812393420edf0c35346582c7a8e50193334

- removed - make use of `--docdir ./configure' option instead

Changed files:
    geany-doc_dir.patch -> 1.8
---

diff --git a/geany-doc_dir.patch b/geany-doc_dir.patch
deleted file mode 100644
index 6c2b628..0000000
--- a/geany-doc_dir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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,3 +1,3 @@
- man_MANS=geany.1
--DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@
-+DOCDIR = $(DESTDIR)/$(datadir)/@PACKAGE@/doc
- IMAGE_FILES = images/*.png
-@@ -45,13 +45,3 @@
- 	    $(INSTALL_DATA) $$file $(DOCDIR)/html/images/$$basefile; \
- 	  fi \
- 	done
--	$(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.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_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