SF.net SVN: geany: [2672] trunk

[eht16 at users.sourceforge.net]

Revision: 2672
          http://geany.svn.sourceforge.net/geany/?rev=2672&view=rev
Author:   eht16
Date:     2008-06-09 10:43:48 -0700 (Mon, 09 Jun 2008)

Log Message:
-----------
Remove useless path separator.
Set $(docdir) if it is not set automatically.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.in
    trunk/doc/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-09 17:29:25 UTC (rev 2671)
+++ trunk/ChangeLog	2008-06-09 17:43:48 UTC (rev 2672)
@@ -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>

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-06-09 17:29:25 UTC (rev 2671)
+++ trunk/configure.in	2008-06-09 17:43:48 UTC (rev 2672)
@@ -230,6 +230,12 @@
 	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`

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2008-06-09 17:29:25 UTC (rev 2671)
+++ trunk/doc/Makefile.am	2008-06-09 17:43:48 UTC (rev 2672)
@@ -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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.