Remove useless path separator.

Set $(docdir) if it is not set automatically.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2672 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-06-09 17:43:48 +00:00
parent 6a830028f8
commit 57b50763df
3 changed files with 11 additions and 1 deletions

View File

@ -3,6 +3,10 @@
* scintilla/makefile.win32:
Compile Scintilla without threading support to fix freezes with
GLib >= 2.16 on Windows.
* doc/Makefile.am:
Remove useless path separator.
* configure.in:
Set $(docdir) if it is not set automatically.
2008-06-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

View File

@ -230,6 +230,12 @@ if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/sh
fi
fi
# Set ${docdir} if it is empty
if test -z "${docdir}"; then
docdir='${datadir}/doc/${PACKAGE}'
AC_SUBST(docdir)
fi
GEANY_PIXMAPS_DIR=`eval echo ${datarootdir}/pixmaps`
AC_SUBST(GEANY_PIXMAPS_DIR)
GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`

View File

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