- up to 0.13

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

diff --git a/geany-doc_dir.patch b/geany-doc_dir.patch
index d6c3f4279fa47e42cce0d39ad7b5073614717b74..db7ac621e0271d0c24c0bbd21fff91c74e62459d 100644 (file)
--- a/geany-doc_dir.patch
+++ b/geany-doc_dir.patch
@@ -1,22 +1,34 @@
-diff -aurN geany.orig/doc/Makefile.am geany/doc/Makefile.am
---- geany.orig/doc/Makefile.am 2005-12-11 19:06:07.000000000 +0100
-+++ geany/doc/Makefile.am      2005-12-21 17:45:14.000000000 +0100
-@@ -1,5 +1,5 @@
- 
+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
- HTML_FILES = html/*.html geany.css
- IMAGE_FILES = images/*.jpg
- EXTRA_DIST = geany.css make_webable.sh geany.txt geany_gpl.docbook geany.1 geany.docbook $(HTML_FILES) $(IMAGE_FILES)
-diff -aurN geany.orig/src/geany.h geany/src/geany.h
---- geany.orig/src/geany.h     2005-12-18 23:38:44.000000000 +0100
-+++ geany/src/geany.h  2005-12-21 17:46:05.000000000 +0100
-@@ -67,7 +67,7 @@
- 
- 
- #ifndef DOCDIR
--# define DOCDIR PACKAGE_DATA_DIR"/doc/"PACKAGE"/html/"
-+# define DOCDIR PACKAGE_DATA_DIR"/"PACKAGE"/doc/html/index.html"
+ 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.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