summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Brabec <sbrabec@suse.cz>2005-10-02 19:38:20 +0000
committerRodney Dawes <dobey@src.gnome.org>2005-10-02 19:38:20 +0000
commit22f50a69b0be1b0ffffe24d6c779b95651c8298b (patch)
tree5b1ae525ec3e5763e898534013ecd4767c77181d
parent4caac638dffcb22833f13867568405aaa228a92c (diff)
downloadadwaita-icon-theme-22f50a69b0be1b0ffffe24d6c779b95651c8298b.tar.gz
Replace $(INSTALL) with $(INSTALL_DATA) so that the installed icons are
2005-10-02 Stanislav Brabec <sbrabec@suse.cz> * 16x16/stock/io/Makefile.am: * 16x16/stock/net/Makefile.am: * 24x24/stock/io/Makefile.am: * 24x24/stock/net/Makefile.am: * 48x48/mimetypes/Makefile.am: Replace $(INSTALL) with $(INSTALL_DATA) so that the installed icons are not flagged as executable Fixes #316173
-rw-r--r--16x16/stock/io/Makefile.am2
-rw-r--r--16x16/stock/net/Makefile.am4
-rw-r--r--24x24/stock/io/Makefile.am2
-rw-r--r--24x24/stock/net/Makefile.am4
-rw-r--r--48x48/mimetypes/Makefile.am26
-rw-r--r--ChangeLog12
6 files changed, 31 insertions, 19 deletions
diff --git a/16x16/stock/io/Makefile.am b/16x16/stock/io/Makefile.am
index 72d071802..9556467e2 100644
--- a/16x16/stock/io/Makefile.am
+++ b/16x16/stock/io/Makefile.am
@@ -27,7 +27,7 @@ icon_DATA =\
$(NULL)
install-data-hook:
- $(INSTALL) $(srcdir)/stock_save-as.png $(DESTDIR)$(icondir)/stock_save_as.png
+ $(INSTALL_DATA) $(srcdir)/stock_save-as.png $(DESTDIR)$(icondir)/stock_save_as.png
uninstall-hook:
rm -f $(DESTDIR)$(icondir)/stock_save_as.png
diff --git a/16x16/stock/net/Makefile.am b/16x16/stock/net/Makefile.am
index 65ea1b82e..fccd722cc 100644
--- a/16x16/stock/net/Makefile.am
+++ b/16x16/stock/net/Makefile.am
@@ -70,7 +70,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)
+ $(INSTALL_DATA) $(srcdir)/stock_shared-by-me.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(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/io/Makefile.am b/24x24/stock/io/Makefile.am
index 2e130e415..83fad8a35 100644
--- a/24x24/stock/io/Makefile.am
+++ b/24x24/stock/io/Makefile.am
@@ -25,7 +25,7 @@ icon_DATA =\
$(NULL)
install-data-hook:
- $(INSTALL) $(srcdir)/stock_save-as.png $(DESTDIR)$(icondir)/stock_save_as.png
+ $(INSTALL_DATA) $(srcdir)/stock_save-as.png $(DESTDIR)$(icondir)/stock_save_as.png
uninstall-hook:
rm -f $(DESTDIR)$(icondir)/stock_save_as.png
diff --git a/24x24/stock/net/Makefile.am b/24x24/stock/net/Makefile.am
index 2fb9a4db2..72c7acbf1 100644
--- a/24x24/stock/net/Makefile.am
+++ b/24x24/stock/net/Makefile.am
@@ -64,7 +64,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)
+ $(INSTALL_DATA) $(srcdir)/stock_shared-by-me.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(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 86e1be23f..1269cc29f 100644
--- a/48x48/mimetypes/Makefile.am
+++ b/48x48/mimetypes/Makefile.am
@@ -202,19 +202,19 @@ icon_DATA =\
install-data-hook:
$(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)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-application-x-qw.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-application-x-trash.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-application-x-core.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-application-x-desktop.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-application-x-class-file.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-application-x-object.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-application-smil.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-audio-midi.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-image-svg+xml.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-text-x-chdr.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-text-x-csrc.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(srcdir)/gnome-mime-text-x-c++src.png $(DESTDIR)$(icondir)
+ $(INSTALL_DATA) $(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
diff --git a/ChangeLog b/ChangeLog
index f8756fa45..0f24eb61f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-02 Stanislav Brabec <sbrabec@suse.cz>
+
+ * 16x16/stock/io/Makefile.am:
+ * 16x16/stock/net/Makefile.am:
+ * 24x24/stock/io/Makefile.am:
+ * 24x24/stock/net/Makefile.am:
+ * 48x48/mimetypes/Makefile.am:
+ Replace $(INSTALL) with $(INSTALL_DATA) so that the installed icons
+ are not flagged as executable
+
+ Fixes #316173
+
2005-10-02 Rodney Dawes <dobey@novell.com>
* 16x16/stock/media/Makefile.am: