HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use configure's --docdir option when installing and using the documentation.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2378 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-03-21 14:28:26 +00:00
parent c248368faf
commit 57fa3d0f16
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* src/callbacks.c: * src/callbacks.c:
When opening the manual on the website, include version string to When opening the manual on the website, include version string to
ensure the appropriate manual version is shown. ensure the appropriate manual version is shown.
* src/prefix.h, src/main.c, src/Makefile.am, doc/Makefile.am:
Use configure's --docdir option when installing and using the
documentation.
2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2008-03-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

2
doc/Makefile.am
View File

@ -1,5 +1,5 @@
man_MANS=geany.1 man_MANS=geany.1
DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@ DOCDIR = $(DESTDIR)/$(docdir)
IMAGE_FILES = images/*.png IMAGE_FILES = images/*.png
EXTRA_DIST = geany.html geany.css geany.txt geany.1 plugins.dox plugin-symbols.c \ EXTRA_DIST = geany.html geany.css geany.txt geany.1 plugins.dox plugin-symbols.c \
$(srcdir)/$(IMAGE_FILES) $(srcdir)/$(IMAGE_FILES)

4
src/Makefile.am
View File

@ -80,8 +80,9 @@ geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIB
-lcomctl32 -liberty -lwsock32 geany_private.res -lcomctl32 -liberty -lwsock32 geany_private.res
AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ AM_CFLAGS = -DGEANY_DATADIR=\"data\" \
-DGEANY_LOCALEDIR=\"data\" \ -DGEANY_DOCDIR=\"\" \
-DGEANY_LIBDIR=\"\" \ -DGEANY_LIBDIR=\"\" \
-DGEANY_LOCALEDIR=\"data\" \
-DGEANY_PREFIX=\"\" -DGEANY_PREFIX=\"\"
geany_LDFLAGS = -mwindows -mms-bitfields geany_LDFLAGS = -mwindows -mms-bitfields
@ -102,6 +103,7 @@ geany_SOURCES = $(SRCS) vte.c vte.h
geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ $(INTLLIBS) geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ $(INTLLIBS)
AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \ AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \
-DGEANY_DOCDIR=\""$(docdir)"\" \
-DGEANY_LIBDIR=\""$(libdir)"\" \ -DGEANY_LIBDIR=\""$(libdir)"\" \
-DGEANY_LOCALEDIR=\""$(localedir)"\" \ -DGEANY_LOCALEDIR=\""$(localedir)"\" \
-DGEANY_PREFIX=\""$(prefix)"\" -DGEANY_PREFIX=\""$(prefix)"\"

2
src/main.c
View File

@ -436,7 +436,7 @@ static void setup_paths(void)
g_free(install_dir); g_free(install_dir);
#else #else
data_dir = g_strconcat(GEANY_DATADIR, "/geany/", NULL); /* e.g. /usr/share/geany */ 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_DOCDIR, "/html/", NULL);
#endif #endif
/* convert path names to locale encoding */ /* convert path names to locale encoding */

2
src/prefix.h
View File

@ -63,6 +63,7 @@
#undef GEANY_PREFIX #undef GEANY_PREFIX
#undef GEANY_DATADIR #undef GEANY_DATADIR
#undef GEANY_LIBDIR #undef GEANY_LIBDIR
#undef GEANY_DOCDIR
#undef GEANY_LOCALEDIR #undef GEANY_LOCALEDIR
#define SELFPATH (br_thread_local_store (br_locate ((void *) ""))) #define SELFPATH (br_thread_local_store (br_locate ((void *) "")))
@ -76,6 +77,7 @@
#define GEANY_PREFIX (br_thread_local_store (br_locate_prefix ((void *) ""))) #define GEANY_PREFIX (br_thread_local_store (br_locate_prefix ((void *) "")))
#define GEANY_DATADIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share"))) #define GEANY_DATADIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share")))
#define GEANY_LIBDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/lib"))) #define GEANY_LIBDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/lib")))
#define GEANY_DOCDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share/doc/geany")))
#define GEANY_LOCALEDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share/locale"))) #define GEANY_LOCALEDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share/locale")))
#endif /* BR_NO_MACROS */ #endif /* BR_NO_MACROS */