]>
Commit | Line | Data |
---|---|---|
1 | diff -aurN geany-0.8.orig/doc/Makefile.am geany-0.8/doc/Makefile.am | |
2 | --- geany-0.8.orig/doc/Makefile.am 2006-07-18 14:28:04.000000000 +0200 | |
3 | +++ geany-0.8/doc/Makefile.am 2006-08-12 00:46:43.159723018 +0200 | |
4 | @@ -1,3 +1,3 @@ | |
5 | man_MANS=geany.1 | |
6 | -DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@ | |
7 | +DOCDIR = $(DESTDIR)/$(datadir)/@PACKAGE@/doc | |
8 | IMAGE_FILES = images/*.png | |
9 | @@ -45,13 +45,3 @@ | |
10 | $(INSTALL_DATA) $$file $(DOCDIR)/html/images/$$basefile; \ | |
11 | fi \ | |
12 | done | |
13 | - $(INSTALL_DATA) $(srcdir)/geany.html $(DOCDIR)/html/index.html | |
14 | - $(INSTALL_DATA) $(srcdir)/geany.txt $(DOCDIR)/manual.txt | |
15 | - $(INSTALL_DATA) $(top_srcdir)/README $(DOCDIR) | |
16 | - $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DOCDIR) | |
17 | - $(INSTALL_DATA) $(top_srcdir)/NEWS $(DOCDIR) | |
18 | - $(INSTALL_DATA) $(top_srcdir)/COPYING $(DOCDIR) | |
19 | - $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DOCDIR) | |
20 | - $(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR) | |
21 | - $(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt | |
22 | - | |
23 | diff -aurN geany-0.13.orig/src/main.c geany-0.13/src/main.c | |
24 | --- geany-0.13.orig/src/main.c 2008-04-11 14:09:34.396089080 +0200 | |
25 | +++ geany-0.13/src/main.c 2008-04-11 14:10:06.920977289 +0200 | |
26 | @@ -382,7 +382,7 @@ static void setup_paths() | |
27 | g_free(install_dir); | |
28 | #else | |
29 | data_dir = g_strconcat(GEANY_DATADIR, "/geany/", NULL); // e.g. /usr/share/geany | |
30 | - doc_dir = g_strconcat(GEANY_DATADIR, "/doc/geany/html/", NULL); | |
31 | + doc_dir = g_strconcat(GEANY_DATADIR, "/doc/geany-", VERSION, "/html/", NULL); | |
32 | #endif | |
33 | ||
34 | // convert path names to locale encoding |