Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@marcopg.org>2010-08-22 11:09:23 (GMT)
committer Marco Pesenti Gritti <marco@marcopg.org>2010-08-22 11:10:17 (GMT)
commitd6bf486fe97918cf06f1d246a16362319093054d (patch)
tree74dcc56f36dc6eb4b9b2051328f7087e09e4bd0f
parent6f09b2e3c829acd98945d65f09c640ca06fa8d7c (diff)
Use a local install directory by default
SUGAR_INSTALL will be used by the startup script to figure out how to setup the environment.
-rw-r--r--.gitignore1
-rw-r--r--configure.ac8
2 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5068607..9a0dfe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ config.status
config.sub
configure
depcomp
+install
install-sh
intltool-extract.in
intltool-merge.in
diff --git a/configure.ac b/configure.ac
index 379861e..f6fd065 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,8 @@ AC_PREREQ([2.59])
AC_INIT([sugar],[0.99],[],[sugar])
+AC_PREFIX_DEFAULT(`pwd`/install)
+
AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
AC_CONFIG_MACRO_DIR([m4])
@@ -39,6 +41,12 @@ PKG_CHECK_MODULES(ENGINE, gtk+-2.0 >= 2.0 gobject-2.0 >= 2.0 cairo >= 0.1.1)
PKG_CHECK_MODULES(SHELL, pygtk-2.0 gtk+-2.0 gconf-2.0)
PKG_CHECK_MODULES(EXT, pygtk-2.0 gtk+-2.0 sm ice alsa)
+if test "x$prefix" = xNONE && test "x$exec_prefix" = xNONE; then
+SUGAR_INSTALL=dev
+else
+SUGAR_INSTALL=system
+fi
+
GETTEXT_PACKAGE=sugar
AC_PROG_INTLTOOL([0.33])
AC_SUBST(GETTEXT_PACKAGE)