[nautilus-actions] Reorganize install order so that plugin be installed last

[Pierre Wieser <pwieser src gnome org>]

commit 3ab17a71c64cb422d1606a968c0a82256d6d1188
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon May 25 20:10:25 2009 +0200

    Reorganize install order so that plugin be installed last
    
    Rationale: in development mode, make install stops with an error when
    trying to install the libnautilus-actions extension library. This is
    normal as I develop with my own user, not root. As the glade file has
    to be installed in its configured location, it is easyer to test the
    UI if it is installed before the error occurs.
---
 ChangeLog    |   46 ++++++++++++++++++++++++++--------------------
 Makefile.am  |   29 ++++++++++++++++-------------
 configure.ac |    6 +++---
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1eb1fe..f25a9eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,38 +1,44 @@
+2009-05-25 Pierre Wieser <pwieser trychlos org>
+
+	* configure.ac:
+	* Makefile.am:
+	Reorganize install order so that plugin be installed last.
+
 2009-05-18 Pierre Wieser <pwieser trychlos org>
 
 	Fix Glade regression I introduced myself when ansi-fying C sources !
 
-	* *.c, *.h: almost all sources files impacted
+	* *.c, *.h: Almost all sources files impacted.
 
-	* m4/nact-maintainer-mode.m4: creation
+	* m4/nact-maintainer-mode.m4: Creation.
 
-	* plugin/nautilus-actions.c: add debug mode to syslog
+	* plugin/nautilus-actions.c: Add debug mode to syslog.
 
 2009-05-17 Pierre Wieser <pwieser trychlos org>
 
 	Releasing 1.10.0
 
-	* configure.ac: update version number
+	* configure.ac: Update version number.
 
 2009-05-17 Pierre Wieser <pwieser trychlos org>
 
 	Make all sources ansi-compliant
 
-	* configure.ac: use NACT_GNOME_COMPILE_WARNINGS	(see #582860)
+	* configure.ac: Use NACT_GNOME_COMPILE_WARNINGS	(see #582860).
 
-	* m4/nact-compiler-flags: creation
+	* m4/nact-compiler-flags: Creation.
 
-	* *.c, *.h: update almost all sources to be ansi-compliant
+	* *.c, *.h: Update almost all sources to be ansi-compliant.
 
 2009-05-16 Pierre Wieser <pwieser trychlos org>
 
-	* configure.ac: created from configure.in
-	update all Makefile.am, replacing deprecated INCLUDES with AM_CPPFLAGS
+	* configure.ac: Created from configure.in,
+	update all Makefile.am, replacing deprecated INCLUDES with AM_CPPFLAGS.
 
 	* update po files
 
-	* Makefile.am: add DISTCLEANFILES,
-	add DISTCHECK_CONFIGURE_FLAGS to be able to make distcheck successfully
+	* Makefile.am: Add DISTCLEANFILES,
+	add DISTCHECK_CONFIGURE_FLAGS to be able to make distcheck successfully.
 
 	* icons/16x16/Makefile.am:
 	* icons/22x22/Makefile.am:
@@ -42,14 +48,14 @@
 	* nact/Makefile.am:
 	* plugin/Makefile.am:
 	* utils/Makefile.am:
-	add EXTRA_DIST to be able to make distcheck successfully
+	Add EXTRA_DIST to be able to make distcheck successfully.
 
 2009-05-13 Pierre Wieser <pwieser trychlos org>
 
 	* nact/nact-editor.c:
 	* libnautilus-actions/nautilus-actions-config.c:
 	* libnautilus-actions/nautilus-actions-config-schema-reader.c:
-	Fix typos. Fixes #522605 reported by Andre Klapper <a9016009%40gmx.de>
+	Fix typos. Fixes #522605 reported by Andre Klapper <a9016009%40gmx.de>.
 
 	* libnautilus-actions/nautilus-actions-config-gconf-private.h:
 	Remove a quote. Fixes #573365 reported by Sergej
@@ -58,12 +64,12 @@
 2009-05-12 Pierre Wieser <pwieser trychlos org>
 
 	* ChangeLog, ChangeLog-2008:
-	split enormeous ChangeLog, only keeping recent history
+	Split enormeous ChangeLog, only keeping recent history.
 
 2009-05-12 Bruce van der Kooij <brucevdkooij gmail com>
 
-	* plugin/nautilus-actions.c: call gnome_vfs_init at class
-	initialization. Fixes #574919.
+	* plugin/nautilus-actions.c:
+	Call gnome_vfs_init at class initialization. Fixes #574919.
 
 2009-05-12 Pierre Wieser <pwieser trychlos org>
 
@@ -74,8 +80,8 @@
 
 	* autogen.sh:
 	* configure.in:
-	* po/LINGUAS: Use newer intltool so the recent build break doesn't
-	occur again.
+	* po/LINGUAS:
+	Use newer intltool so the recent build break doesn't occur again.
 
 2009-04-12  Christian Persch  <chpe gnome org>
 
@@ -83,5 +89,5 @@
 
 2009-01-20  Stéphane Raimbault  <stephane raimbault gmail com>
 
-	* nact/nautilus-actions-config.glade: Marked 'Duplicate' string
-	for translation. Fixes #568366.
+	* nact/nautilus-actions-config.glade:
+	Marked 'Duplicate' string for translation. Fixes #568366.
diff --git a/Makefile.am b/Makefile.am
index 330f8a2..c382cd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,13 +28,14 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = \
-	icons				\
-	libnautilus-actions	\
-	plugin				\
-	m4					\
-	nact				\
-	po					\
-	$(OPTIONAL_SUBDIR)
+	m4							\
+	icons						\
+	po							\
+	libnautilus-actions			\
+	nact						\
+	$(OPTIONAL_SUBDIR)			\
+	plugin						\
+	$(NULL)
 
 # a foo directory so that make distcheck has a vpath which is prefixed
 # with a make variable, instead of hardcoded as returned by pkg-config
@@ -42,11 +43,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-nautilus-extdir='$${libdir}/nautilus/extensions-2.0-distcheck'
 
 EXTRA_DIST = \
-	intltool-extract.in	\
-	intltool-merge.in	\
-	intltool-update.in
+	intltool-extract.in			\
+	intltool-merge.in			\
+	intltool-update.in			\
+	$(NULL)
 
 DISTCLEANFILES = \
-	intltool-extract	\
-	intltool-merge		\
-	intltool-update
+	intltool-extract			\
+	intltool-merge				\
+	intltool-update				\
+	$(NULL)
diff --git a/configure.ac b/configure.ac
index 0ead83a..7379e47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,18 +37,18 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([
 	Makefile
+	m4/Makefile
 	icons/Makefile
 	icons/16x16/Makefile
 	icons/22x22/Makefile
 	icons/32x32/Makefile
 	icons/48x48/Makefile
 	icons/scalable/Makefile
+	po/Makefile.in
 	libnautilus-actions/Makefile
-	m4/Makefile
 	nact/Makefile
-	plugin/Makefile
-	po/Makefile.in
 	utils/Makefile
+	plugin/Makefile
 ])
 
 AC_CONFIG_MACRO_DIR([m4])