From 81e287cc836cfb99de3af1d267330a817049059f Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 6 Mar 2002 02:57:42 +0000 Subject: [PATCH] gdk/Makefile.am use install-foo-hook instead of install-foo-local, since 2002-03-05 Manish Singh * 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 --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/Makefile.am | 4 ++-- gtk/Makefile.am | 4 ++-- 9 files changed, 53 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c10237a23..7714666434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-03-05 Manish Singh + + * 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 * configure.in: change an == to = diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5c10237a23..7714666434 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2002-03-05 Manish Singh + + * 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 * configure.in: change an == to = diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c10237a23..7714666434 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2002-03-05 Manish Singh + + * 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 * configure.in: change an == to = diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5c10237a23..7714666434 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2002-03-05 Manish Singh + + * 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 * configure.in: change an == to = diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5c10237a23..7714666434 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2002-03-05 Manish Singh + + * 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 * configure.in: change an == to = diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5c10237a23..7714666434 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2002-03-05 Manish Singh + + * 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 * configure.in: change an == to = diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5c10237a23..7714666434 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2002-03-05 Manish Singh + + * 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 * configure.in: change an == to = diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 8bba21f69b..989921298a 100644 --- 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 33ac306659..955cdbb2a0 100644 --- 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