From abb1251461e7d561ea70f1d51a0a48f9c8ae01ba Mon Sep 17 00:00:00 2001 From: "Rob Kendrick (fatigue)" Date: Sun, 4 Nov 2012 11:17:41 +0000 Subject: Try to rationalise the gtk install target somewhat --- gtk/Makefile.target | 48 ++++++++++++++++++++---------------------------- gtk/res/C/Messages | 1 - gtk/res/de/Messages | 1 - gtk/res/de/welcome.html | 1 + gtk/res/en/Messages | 1 - gtk/res/fr/Messages | 1 - gtk/res/it/Messages | 1 - gtk/res/it/credits.html | 1 + gtk/res/it/licence.html | 1 + gtk/res/it/welcome.html | 1 + gtk/res/ja/welcome.html | 1 + gtk/res/nl/Messages | 1 - 12 files changed, 25 insertions(+), 34 deletions(-) delete mode 120000 gtk/res/C/Messages delete mode 120000 gtk/res/de/Messages create mode 120000 gtk/res/de/welcome.html delete mode 120000 gtk/res/en/Messages delete mode 120000 gtk/res/fr/Messages delete mode 120000 gtk/res/it/Messages create mode 120000 gtk/res/it/credits.html create mode 120000 gtk/res/it/licence.html create mode 120000 gtk/res/it/welcome.html create mode 120000 gtk/res/ja/welcome.html delete mode 120000 gtk/res/nl/Messages (limited to 'gtk') diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 0018a67d5..391415cee 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -124,36 +124,28 @@ EXETARGET := nsgtk # Install target # ---------------------------------------------------------------------------- +GTK_RESOURCES_LIST := adblock.css arrow_down_8x32.png ca-bundle.txt default.css \ + default.ico favicon.png gtkdefault.css internal.css \ + languages license netsurf.png netsurf.xpm \ + netsurf-16x16.xpm quirks.css themelist toolbarIndices \ + SearchEngines +GTK_RESOURCES_LIST := $(addprefix gtk/res/, $(GTK_RESOURCES_LIST)) \ + $(wildcard gtk/res/*.gtk*.ui) + +# translations with more than just Messages files +GTK_TRANSLATIONS_HTML := de en it ja + install-gtk: - mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber - mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons - mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN) - @cp -RLv nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf - @cp -RLv gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber - @cp -RLv gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @cp -RLv gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @tar cf - -h -C gtk/res themes | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) - @# Install translations - @tar cf - -h -C gtk/res C de en fr it nl | tar xf - -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) + $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber + $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons + $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN) + $(Q)install -vC nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf + $(Q)install -vC -m 0644 -t $(DESTDIR)$(NETSURF_GTK_RESOURCES) $(GTK_RESOURCES_LIST) + $(Q)install -vC -m 0644 -t $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons gtk/res/icons/*.png + $(Q)install -vC -m 0644 -t $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber gtk/res/throbber/*.png + $(Q)tar c -h -C gtk/res themes | tar xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) + $(Q)tar c -h -C gtk/res $(GTK_TRANSLATIONS_HTML) | tar xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) $(call split_install_messages, gtk, $(DESTDIR)$(NETSURF_GTK_RESOURCES)) - @# Install glade templates - @cp -RLv gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES) # ---------------------------------------------------------------------------- # Package target diff --git a/gtk/res/C/Messages b/gtk/res/C/Messages deleted file mode 120000 index 72c9eff90..000000000 --- a/gtk/res/C/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/en/Messages \ No newline at end of file diff --git a/gtk/res/de/Messages b/gtk/res/de/Messages deleted file mode 120000 index 2f1fc39c3..000000000 --- a/gtk/res/de/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/de/Messages \ No newline at end of file diff --git a/gtk/res/de/welcome.html b/gtk/res/de/welcome.html new file mode 120000 index 000000000..b2ddfc796 --- /dev/null +++ b/gtk/res/de/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/de/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/en/Messages b/gtk/res/en/Messages deleted file mode 120000 index 72c9eff90..000000000 --- a/gtk/res/en/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/en/Messages \ No newline at end of file diff --git a/gtk/res/fr/Messages b/gtk/res/fr/Messages deleted file mode 120000 index a42cf08f4..000000000 --- a/gtk/res/fr/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/fr/Messages \ No newline at end of file diff --git a/gtk/res/it/Messages b/gtk/res/it/Messages deleted file mode 120000 index d4c5c2956..000000000 --- a/gtk/res/it/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/it/Messages \ No newline at end of file diff --git a/gtk/res/it/credits.html b/gtk/res/it/credits.html new file mode 120000 index 000000000..6e1e15ed5 --- /dev/null +++ b/gtk/res/it/credits.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/it/credits.html,faf \ No newline at end of file diff --git a/gtk/res/it/licence.html b/gtk/res/it/licence.html new file mode 120000 index 000000000..3a7c056b6 --- /dev/null +++ b/gtk/res/it/licence.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/it/licence.html,faf \ No newline at end of file diff --git a/gtk/res/it/welcome.html b/gtk/res/it/welcome.html new file mode 120000 index 000000000..dea1e839c --- /dev/null +++ b/gtk/res/it/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/it/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/ja/welcome.html b/gtk/res/ja/welcome.html new file mode 120000 index 000000000..827796f02 --- /dev/null +++ b/gtk/res/ja/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/ja/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/nl/Messages b/gtk/res/nl/Messages deleted file mode 120000 index d484ebd29..000000000 --- a/gtk/res/nl/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/nl/Messages \ No newline at end of file -- cgit v1.2.3