From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Wed, 9 Apr 2014 23:59:44 +0000 (+0200)
Subject: Merge branch 'master' into v0.8
X-Git-Tag: v0.8.0.5~4
X-Git-Url: https://git.wpitchoune.net/gitweb/?a=commitdiff_plain;h=4e2f971f215b22026bbc390f552a15700934cb6f;hp=a5d102939f3b7eee38e67543318d7921a3e1d8ee;p=psensor.git

Merge branch 'master' into v0.8
---

diff --git a/po/Makefile.in b/po/Makefile.in
index c9840f8..0ea07b3 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -21,7 +21,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /tmp
+prefix = /usr/local
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}
@@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work/psensor/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p