summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--caja-python.pc.in2
-rw-r--r--configure.ac15
2 files changed, 7 insertions, 10 deletions
diff --git a/caja-python.pc.in b/caja-python.pc.in
index 574674c..280e1dc 100644
--- a/caja-python.pc.in
+++ b/caja-python.pc.in
@@ -4,4 +4,4 @@ Version: @VERSION@
prefix=@prefix@
libdir=${prefix}/lib
-pythondir=@datadir@/caja-python/extensions
+pythondir=${datadir}/caja-python/extensions
diff --git a/configure.ac b/configure.ac
index 94ae4b3..9c80db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,9 @@
-AC_INIT
-
-PACKAGE=caja-python
-VERSION=1.6.0
+AC_INIT([caja-python], [1.6.0], [http://mate-desktop.org])
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
@@ -27,7 +24,7 @@ GTK_DOC_CHECK(1.9)
dnl Give error and exit if we dont have pkgconfig
if test "x$HAVE_PKGCONFIG" = "xno"; then
- AC_MSG_ERROR(you need to have pkgconfig installed !)
+ AC_MSG_ERROR([you need to have pkgconfig installed !])
fi
AC_PREFIX_DEFAULT([$(pkg-config --variable=prefix libcaja-extension || echo /usr)])
@@ -35,8 +32,8 @@ AC_PREFIX_DEFAULT([$(pkg-config --variable=prefix libcaja-extension || echo /usr
dnl **************************************************
dnl * Check for Python
dnl **************************************************
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR(could not find Python lib)])
+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([could not find Python headers])])
+AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR([could not find Python lib])])
if test "`pkg-config --variable=datadir pygobject-3.0`" != "" ; then
PYGOBJECT_VERSION=pygobject-3.0
@@ -100,7 +97,7 @@ AC_OUTPUT([
])
echo
-echo " caja-python $VERSION"
+echo " caja-python $PACKAGE_VERSION"
echo
echo " Caja Prefix: ${prefix}"
echo " PyGObject Version: ${PYGOBJECT_VERSION}"