gdk/Makefile.am use install-foo-hook instead of install-foo-local, since

2002-03-05  Manish Singh  <yosh@gimp.org>

        * gdk/Makefile.am
        * gtk/Makefile.am: use install-foo-hook instead of install-foo-local,
        since foo-local is run before the their respective builtin targets
        in automake 1.5

diff --git a/ChangeLog b/ChangeLog
index 5c10237a232036dadf3f0beabec03a7cde4409ae..771466643470f538a540712e30349df568d9175c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-05  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: use install-foo-hook instead of install-foo-local,
+        since foo-local is run before the their respective builtin targets
+       in automake 1.5
+
 2002-03-05  jacob berkman  <jacob@ximian.com>
 
        * configure.in: change an == to =

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5c10237a232036dadf3f0beabec03a7cde4409ae..771466643470f538a540712e30349df568d9175c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2002-03-05  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: use install-foo-hook instead of install-foo-local,
+        since foo-local is run before the their respective builtin targets
+       in automake 1.5
+
 2002-03-05  jacob berkman  <jacob@ximian.com>
 
        * configure.in: change an == to =

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5c10237a232036dadf3f0beabec03a7cde4409ae..771466643470f538a540712e30349df568d9175c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2002-03-05  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: use install-foo-hook instead of install-foo-local,
+        since foo-local is run before the their respective builtin targets
+       in automake 1.5
+
 2002-03-05  jacob berkman  <jacob@ximian.com>
 
        * configure.in: change an == to =

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5c10237a232036dadf3f0beabec03a7cde4409ae..771466643470f538a540712e30349df568d9175c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2002-03-05  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: use install-foo-hook instead of install-foo-local,
+        since foo-local is run before the their respective builtin targets
+       in automake 1.5
+
 2002-03-05  jacob berkman  <jacob@ximian.com>
 
        * configure.in: change an == to =

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5c10237a232036dadf3f0beabec03a7cde4409ae..771466643470f538a540712e30349df568d9175c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2002-03-05  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: use install-foo-hook instead of install-foo-local,
+        since foo-local is run before the their respective builtin targets
+       in automake 1.5
+
 2002-03-05  jacob berkman  <jacob@ximian.com>
 
        * configure.in: change an == to =

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5c10237a232036dadf3f0beabec03a7cde4409ae..771466643470f538a540712e30349df568d9175c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2002-03-05  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: use install-foo-hook instead of install-foo-local,
+        since foo-local is run before the their respective builtin targets
+       in automake 1.5
+
 2002-03-05  jacob berkman  <jacob@ximian.com>
 
        * configure.in: change an == to =

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5c10237a232036dadf3f0beabec03a7cde4409ae..771466643470f538a540712e30349df568d9175c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2002-03-05  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: use install-foo-hook instead of install-foo-local,
+        since foo-local is run before the their respective builtin targets
+       in automake 1.5
+
 2002-03-05  jacob berkman  <jacob@ximian.com>
 
        * configure.in: change an == to =

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 8bba21f69b763cc465e6797160bb55ff95ee3f20..989921298a909d1ad818e26f960778fe5e307a2d 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -181,7 +181,7 @@ sanitize-la:
        @true
 endif
 
-install-exec-local: gdkconfig.h sanitize-la
+install-exec-hook: gdkconfig.h sanitize-la
        $(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
        file=$(DESTDIR)$(configexecincludedir)/gdkconfig.h; \
        if test -r $$file && cmp -s gdkconfig.h $$file; then :; \
@@ -205,7 +205,7 @@ stamp-gc-h: ../config.status
        cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
-install-data-local: install-ms-lib install-libtool-import-lib
+install-data-hook: install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 33ac30665931dee7ace5c175dd84a120f9edcb6d..955cdbb2a01ddaa14d599243b55399de898c6231 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -557,13 +557,13 @@ libgtk_target_ldflags = $(gtk_win32_symbols) -lwsock32
 endif
 EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la
 
+install-exec-hook: 
 if DISABLE_EXPLICIT_DEPS
-install-exec-local: 
        $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib)
 endif
 
 # Install a RC file for the default GTK+ theme, and key themes
-install-data-local:  install-ms-lib install-libtool-import-lib
+install-data-hook: install-ms-lib install-libtool-import-lib
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
        $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key