summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFran├žois Revel <mmu_man@netsurf-browser.org>2012-04-12 18:38:10 +0000
committerFran├žois Revel <mmu_man@netsurf-browser.org>2012-04-12 18:38:10 +0000
commit839c4aef8a7095a2eced22548b8bd2057ad251ed (patch)
tree489f05f4351321517c5ffa46f1b6c5185c2901b4 /Makefile
parent647a36e2ee1feb35a872a066c9e652e459a8b32c (diff)
downloadnetsurf-839c4aef8a7095a2eced22548b8bd2057ad251ed.tar.gz
netsurf-839c4aef8a7095a2eced22548b8bd2057ad251ed.tar.bz2
Fix errors when installing multiple times due to cp failing on .svn directories.
svn path=/trunk/netsurf/; revision=13859
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 4 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index e54989bf2..08f024cdf 100644
--- a/Makefile
+++ b/Makefile
@@ -616,6 +616,7 @@ clean: $(CLEANS)
install-gtk: nsgtk
@# TODO: filter out .svn directories from install location
mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
@cp nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
@cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@@ -626,7 +627,7 @@ install-gtk: nsgtk
@cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/icons $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@@ -638,14 +639,9 @@ install-gtk: nsgtk
@cp -RL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
@cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/themes $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@# Install translations
- @cp -RL gtk/res/C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/de $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/en $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/fr $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/it $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/nl $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@# Install glade templates
@gzip -9v < gtk/res/cookies.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)cookies.glade
@gzip -9v < gtk/res/downloads.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)downloads.glade