SF.net SVN: geany: [1769] trunk

[eht16 at users.sourceforge.net]

Revision: 1769
          http://geany.svn.sourceforge.net/geany/?rev=1769&view=rev
Author:   eht16
Date:     2007-08-04 01:33:56 -0700 (Sat, 04 Aug 2007)

Log Message:
-----------
Fix error in "make install" caused by old automake versions and intltool.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-03 15:05:53 UTC (rev 1768)
+++ trunk/ChangeLog	2007-08-04 08:33:56 UTC (rev 1769)
@@ -1,3 +1,9 @@
+2007-08-04  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * configure.in: Fix error in "make install" caused by old automake
+                 versions and intltool.
+
+
 2007-08-03  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/plugindata.h, src/plugins.c, src/editor.h, HACKING:

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-08-03 15:05:53 UTC (rev 1768)
+++ trunk/configure.in	2007-08-04 08:33:56 UTC (rev 1769)
@@ -175,6 +175,11 @@
 GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
 AC_SUBST(GEANY_DATA_DIR)
 
+# intltool hack to define install_sh on Debian/Ubuntu systems
+if test "x$install_sh" = "x"; then
+	install_sh="`pwd`/install-sh"
+	AC_SUBST(install_sh)
+fi
 
 AC_OUTPUT([
 Makefile


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