summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]s.com>2013-10-31 06:53:50 -0700
committerStefano Karapetsas <[email protected]>2013-10-31 06:53:50 -0700
commit533d7fd7eff6154b97efceb47d2b438bdf1ee91c (patch)
treeb6cd5afa7afb23ed3f5909981882944001ab19a8
parent11cb0cb8f97a12def8d0414ec2f8ac27e71911da (diff)
parent3a73f001091efb46993acadafd942a54335ca204 (diff)
downloadcaja-extensions-1.7.0.tar.bz2
caja-extensions-1.7.0.tar.xz
Merge pull request #2 from infirit/mastercaja-extensions-1.7.0
Fix stupid typo, automake fix and summary improvement
-rw-r--r--configure.ac8
-rw-r--r--gksu/Makefile.am3
2 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 3b79583..fc78956 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ AC_ARG_ENABLE([open-terminal],
[enable_open_terminal=$enableval],
[enable_open_terminal=yes])
-if test "x$enable_open-terminal" = "xyes"; then
+if test "x$enable_open_terminal" = "xyes"; then
PKG_CHECK_MODULES(OPENTERMINAL,
glib-2.0 >= $GLIB_REQUIRED
mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED)
@@ -179,6 +179,12 @@ AC_OUTPUT([
])
echo "
+caja-extensions-$VERSION:
+ prefix: ${prefix}
+ compiler: ${CC}
+ caja-extension dir ${ac_with_cajadir}
+ Gtk+ version: ${GTK_API_VERSION}
+
Plugins to be build:
Image Converter: $enable_image_converter
Open Terminal: $enable_open_terminal
diff --git a/gksu/Makefile.am b/gksu/Makefile.am
index 4180075..be1bb7d 100644
--- a/gksu/Makefile.am
+++ b/gksu/Makefile.am
@@ -1,6 +1,5 @@
AM_CFLAGS = -g -O2 -Wall
-INCLUDES = ${CAJA_CFLAGS}
-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" $(CAJA_CFLAGS)
caja_extensiondir=$(libdir)/caja/extensions-2.0
caja_extension_LTLIBRARIES = libcaja-gksu.la