diff options
| author | Manish Singh <yosh@gimp.org> | 2003-11-18 00:26:51 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2003-11-18 00:26:51 +0000 |
| commit | 477e349f84a795b6ffd89bbcd71517cdc49251ba (patch) | |
| tree | 67dc07b54f48d46cf163fd21ce9c51110c5e1f56 /modules | |
| parent | d3b444a4c5b7b997fc8619f0b3b7befb284cb298 (diff) | |
| download | gtk+-477e349f84a795b6ffd89bbcd71517cdc49251ba.tar.gz | |
gdk-pixbuf/Makefile.am Use install-data-hook for gdk-pixbuf.loaders and
Mon Nov 17 16:25:04 2003 Manish Singh <yosh@gimp.org>
* gdk-pixbuf/Makefile.am
* modules/input/Makefile.am: Use install-data-hook for
gdk-pixbuf.loaders and gtk.immodules install generation targets.
Fixes #112806.
* gtk/gtkexpander.h: Apply missing declarations from #124449.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index dc552b5886..5f8400fd58 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -87,7 +87,11 @@ endif # Running this if cross compiling or if DESTDIR is set is going to # not work at all, so skip it. -install-data-local: +# We use install-data-hook here to workaround a bug in automake and/or libtool +# that makes the install target for the loader libraries a dependency on +# install-data-am, and not install-exec-am. We need to ensure this gets run +# after the libraries are installed in their final locations. +install-data-hook: @if $(RUN_QUERY_IMMODULES_TEST) ; then \ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ |