[nautilus-actions] Fix nautilus-extdir.m4 macro
- From: Pierre Wieser <pwieser src gnome org>
- To: svn-commits-list gnome org
- Subject: [nautilus-actions] Fix nautilus-extdir.m4 macro
- Date: Sat, 16 May 2009 17:04:27 -0400 (EDT)
commit 2cda3077d89fe63a0259ce178697e319409820be
Author: Pierre Wieser <pwieser trychlos org>
Date: Sat May 16 23:06:21 2009 +0200
Fix nautilus-extdir.m4 macro
---
Makefile.am | 3 ++-
configure.ac | 2 +-
libnautilus-actions/Makefile.am | 4 ++--
m4/Makefile.am | 7 ++++---
m4/nautilus-extdir.m4 | 2 +-
nact/Makefile.am | 4 ++--
plugin/Makefile.am | 4 ++--
utils/Makefile.am | 4 ++--
8 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 83b2979..1fc74ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,11 +30,12 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
+ icons \
libnautilus-actions \
plugin \
+ m4 \
nact \
po \
- icons \
$(OPTIONAL_SUBDIR)
# a foo directory so that make distcheck has a vpath which is prefixed
diff --git a/configure.ac b/configure.ac
index 02f5c42..a3168bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ AC_SUBST([AM_CFLAGS],["${AM_CFLAGS} ${WARN_CFLAGS}"])
AM_PROG_LIBTOOL
# localization
-# note that this version is also required for in autogen.sh
+# note that this same version is also required for in autogen.sh
IT_PROG_INTLTOOL([0.35.5])
GETTEXT_PACKAGE=${PACKAGE}
AC_SUBST([GETTEXT_PACKAGE])
diff --git a/libnautilus-actions/Makefile.am b/libnautilus-actions/Makefile.am
index 35bd06b..0f74d6e 100644
--- a/libnautilus-actions/Makefile.am
+++ b/libnautilus-actions/Makefile.am
@@ -25,11 +25,11 @@
# Pierre Wieser <pwieser trychlos org>
# and many others (see AUTHORS)
#
-# pwi 2009-05-16 fix to make distcheck successfully
+# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
noinst_LTLIBRARIES = libnautilus-actions.la
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(NAUTILUS_ACTIONS_CFLAGS)
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 493cb07..d7cee45 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,8 +1,8 @@
# Nautilus Actions
#
# Copyright (C) 2005 The GNOME Foundation
-# Copyright (C) 2006, 2007, 2008 Frederic Ruaudel, Rodrigo Moya
-# Copyright (C) 2009 Pierre Wieser
+# Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+# Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
#
# This Program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -23,5 +23,6 @@
# Frederic Ruaudel <grumz grumz net>
# Rodrigo Moya <rodrigo gnome-db org>
# Pierre Wieser <pwieser trychlos org>
+# and many others (see AUTHORS)
#
-# pwi 2009-05-15 creation
+# pwi 2009-05-16 creation
diff --git a/m4/nautilus-extdir.m4 b/m4/nautilus-extdir.m4
index f95c768..aa09655 100644
--- a/m4/nautilus-extdir.m4
+++ b/m4/nautilus-extdir.m4
@@ -45,7 +45,7 @@ AC_DEFUN([NACT_NAUTILUS_EXTDIR],[
AC_DEFUN([_AC_ARG_NACT_NAUTILUS_EXTDIR],[
AC_ARG_WITH(
- [nact_nautilus_extdir],
+ [nautilus-extdir],
AC_HELP_STRING(
[--with-nautilus-extdir=DIR],
[nautilus plugins extension directory @<:@auto@:>@]
diff --git a/nact/Makefile.am b/nact/Makefile.am
index bf34429..739e586 100644
--- a/nact/Makefile.am
+++ b/nact/Makefile.am
@@ -25,12 +25,12 @@
# Pierre Wieser <pwieser trychlos org>
# and many others (see AUTHORS)
#
-# pwi 2009-05-16 fix to make distcheck successfully
+# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
bin_PROGRAMS = \
nautilus-actions-config
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
-I $(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGLADEDIR=\""$(datadir)/nautilus-actions/nact"\" \
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 692519b..a4bec8b 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -25,9 +25,9 @@
# Pierre Wieser <pwieser trychlos org>
# and many others (see AUTHORS)
#
-# pwi 2009-05-16 fix to make distcheck successfully
+# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
-I $(top_srcdir) \
$(NAUTILUS_ACTIONS_CFLAGS)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index d1f9d59..c94d0e1 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -25,13 +25,13 @@
# Pierre Wieser <pwieser trychlos org>
# and many others (see AUTHORS)
#
-# pwi 2009-05-16 fix to make distcheck successfully
+# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
bin_PROGRAMS = \
nautilus-actions-new-config \
nautilus-actions-check-actions-change
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
-I $(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(NAUTILUS_ACTIONS_UTILS_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]