diff options
| -rw-r--r-- | 16x16/stock/net/Makefile.am | 4 | ||||
| -rw-r--r-- | 24x24/stock/net/Makefile.am | 4 | ||||
| -rw-r--r-- | 48x48/mimetypes/Makefile.am | 26 | ||||
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | configure.in | 2 |
6 files changed, 34 insertions, 19 deletions
diff --git a/16x16/stock/net/Makefile.am b/16x16/stock/net/Makefile.am index 3b7f7fd9a..8b5102524 100644 --- a/16x16/stock/net/Makefile.am +++ b/16x16/stock/net/Makefile.am @@ -69,8 +69,8 @@ EXTRA_DIST = $(icon_DATA) install-data-local: $(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems - $(INSTALL) stock_shared-by-me.png $(DESTDIR)$(icondir) - $(INSTALL) stock_shared-to-me.png $(DESTDIR)$(icondir) + $(INSTALL) $(srcdir)/stock_shared-by-me.png $(DESTDIR)$(icondir) + $(INSTALL) $(srcdir)/stock_shared-to-me.png $(DESTDIR)$(icondir) $(LN_S) $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png $(LN_S) $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png diff --git a/24x24/stock/net/Makefile.am b/24x24/stock/net/Makefile.am index faf7db0f1..33e9c5795 100644 --- a/24x24/stock/net/Makefile.am +++ b/24x24/stock/net/Makefile.am @@ -63,7 +63,7 @@ EXTRA_DIST = $(icon_DATA) install-data-local: $(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems - $(INSTALL) stock_shared-by-me.png $(DESTDIR)/$(icondir) - $(INSTALL) stock_shared-to-me.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/stock_shared-by-me.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/stock_shared-to-me.png $(DESTDIR)/$(icondir) $(LN_S) $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png $(LN_S) $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png diff --git a/48x48/mimetypes/Makefile.am b/48x48/mimetypes/Makefile.am index d971ca269..0422d5694 100644 --- a/48x48/mimetypes/Makefile.am +++ b/48x48/mimetypes/Makefile.am @@ -204,19 +204,19 @@ icon_DATA =\ $(NULL) install-data-hook: - $(INSTALL) gnome-mime-application-x-qw.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-application-x-trash.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-application-x-core.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-application-x-desktop.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-application-x-class-file.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-application-x-object.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-application-smil.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-audio-midi.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-image-svg+xml.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-text-x-chdr.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-text-x-csrc.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-text-x-c++src.png $(DESTDIR)/$(icondir) - $(INSTALL) gnome-mime-application-x-shellscript.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-application-x-qw.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-application-x-trash.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-application-x-core.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-application-x-desktop.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-application-x-class-file.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-application-x-object.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-application-smil.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-audio-midi.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-image-svg+xml.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-text-x-chdr.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-text-x-csrc.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-text-x-c++src.png $(DESTDIR)/$(icondir) + $(INSTALL) $(srcdir)/gnome-mime-application-x-shellscript.png $(DESTDIR)/$(icondir) $(LN_S) gnome-mime-application-x-qw.png $(DESTDIR)$(icondir)/gnome-mime-application-qif.png $(LN_S) gnome-mime-application-x-trash.png $(DESTDIR)$(icondir)/gnome-mime-application-x-backup.png $(LN_S) gnome-mime-application-x-core.png $(DESTDIR)$(icondir)/gnome-mime-application-x-core-file.png @@ -1,5 +1,15 @@ 2005-07-25 Rodney Dawes <dobey@novell.com> + * NEWS: + * configure.in: Update for 2.11.90 release + + * 16x16/stock/net/Makefile.am: + * 24x24/stock/net/Makefile.am: + * 48x48/mimetypes/Makefile.am: Add $(srcdir) to $(INSTALL) commands + in install-data-local to support srcdir != builddir + +2005-07-25 Rodney Dawes <dobey@novell.com> + * 16x16/stock/net/Makefile.am: * 24x24/stock/net/Makefile.am: * 48x48/mimetypes/Makefile.am: Work around automake wanting to do @@ -1,4 +1,9 @@ -Version 2.11.5 +Version 2.11.90 + +Changes since 2.11.5 + +* Install image files required by symlinks so cp does not break on win32 + (Rodney Dawes) Changes since 2.11.4 diff --git a/configure.in b/configure.in index c1d93f807..1a1def4b8 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT([gnome-icon-theme], [2.11.5], +AC_INIT([gnome-icon-theme], [2.11.90], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme]) AC_CONFIG_SRCDIR(index.theme.in) |