diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-09-04 15:50:14 +0000 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2005-09-04 15:50:14 +0000 |
| commit | 8cefef9f6f4a4ed80ad22b47de5ffb75acb9263e (patch) | |
| tree | 81b96ea1053110bcfe872404f847030077eb87f3 | |
| parent | 74e98da3ccb143c14b5369cb9f9f259cab13e1ed (diff) | |
| download | adwaita-icon-theme-8cefef9f6f4a4ed80ad22b47de5ffb75acb9263e.tar.gz | |
16x16/stock/net/Makefile.am (install-data-local)
2005-08-30 Tor Lillqvist <tml@novell.com>
* 16x16/stock/net/Makefile.am (install-data-local)
* 24x24/stock/net/Makefile.am (install-data-local)
* 48x48/mimetypes/Makefile.am (install-data-hook):
Create icondir before installing into it.
No / between $(DESTDIR) and $(icondir).
| -rw-r--r-- | 16x16/stock/net/Makefile.am | 1 | ||||
| -rw-r--r-- | 24x24/stock/net/Makefile.am | 5 | ||||
| -rw-r--r-- | 48x48/mimetypes/Makefile.am | 27 | ||||
| -rw-r--r-- | ChangeLog | 8 |
4 files changed, 26 insertions, 15 deletions
diff --git a/16x16/stock/net/Makefile.am b/16x16/stock/net/Makefile.am index 8b5102524..6e3809064 100644 --- a/16x16/stock/net/Makefile.am +++ b/16x16/stock/net/Makefile.am @@ -69,6 +69,7 @@ EXTRA_DIST = $(icon_DATA) install-data-local: $(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems + $(mkinstalldirs) $(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 diff --git a/24x24/stock/net/Makefile.am b/24x24/stock/net/Makefile.am index 33e9c5795..2fb9a4db2 100644 --- a/24x24/stock/net/Makefile.am +++ b/24x24/stock/net/Makefile.am @@ -63,7 +63,8 @@ EXTRA_DIST = $(icon_DATA) install-data-local: $(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems - $(INSTALL) $(srcdir)/stock_shared-by-me.png $(DESTDIR)/$(icondir) - $(INSTALL) $(srcdir)/stock_shared-to-me.png $(DESTDIR)/$(icondir) + $(mkinstalldirs) $(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 3bf148518..86e1be23f 100644 --- a/48x48/mimetypes/Makefile.am +++ b/48x48/mimetypes/Makefile.am @@ -201,19 +201,20 @@ icon_DATA =\ $(NULL) install-data-hook: - $(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) + $(mkinstalldirs) $(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,3 +1,11 @@ +2005-08-30 Tor Lillqvist <tml@novell.com> + + * 16x16/stock/net/Makefile.am (install-data-local) + * 24x24/stock/net/Makefile.am (install-data-local) + * 48x48/mimetypes/Makefile.am (install-data-hook): + Create icondir before installing into it. + No / between $(DESTDIR) and $(icondir). + 2005-09-03 Jakub Steiner <jimmac@ximian.com> * scalable/apps/Makefile.am: this actually goes to hicolor |