diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-08-19 15:59:51 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-08-19 15:59:51 +0100 |
| commit | e5d2cba11f02c95712bf7aea3eb2f0eafa541046 (patch) | |
| tree | 9694b35ad489ef151dc2e8b439e8d0a348213adf /gtk | |
| parent | 20f99a8e961036c2ac8754f8352423a90159e0d0 (diff) | |
| download | netsurf-e5d2cba11f02c95712bf7aea3eb2f0eafa541046.tar.gz netsurf-e5d2cba11f02c95712bf7aea3eb2f0eafa541046.tar.bz2 | |
fix gtk install target to provide language fallback
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.target | 25 | ||||
| l--------- | gtk/res/C/Messages | 1 | ||||
| l--------- | gtk/res/C/credits.html | 1 | ||||
| l--------- | gtk/res/C/licence.html | 1 | ||||
| l--------- | gtk/res/C/welcome.html | 1 | ||||
| l--------- | gtk/res/Messages | 1 | ||||
| l--------- | gtk/res/credits.html | 1 | ||||
| l--------- | gtk/res/licence.html | 1 | ||||
| l--------- | gtk/res/welcome.html | 1 |
9 files changed, 18 insertions, 15 deletions
diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 6e71ff3ee..513cb22de 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -126,28 +126,31 @@ 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) +GTK_RESOURCES_LIST := \ + languages themelist SearchEngines toolbarIndices ca-bundle.txt \ + default.css adblock.css quirks.css internal.css gtkdefault.css \ + credits.html licence.html welcome.html Messages \ + default.ico favicon.png netsurf.png netsurf.xpm netsurf-16x16.xpm \ + arrow_down_8x32.png + +GTK_RESOURCES_LIST := \ + $(addprefix gtk/res/, $(GTK_RESOURCES_LIST)) \ + $(wildcard gtk/res/*.gtk$(NETSURF_GTK_MAJOR).ui) # translations with more than just Messages files GTK_TRANSLATIONS_HTML := de en fr it ja nl install-gtk: - $(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 nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf - $(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(DESTDIR)$(NETSURF_GTK_RESOURCES) + $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons $(Q)install -m 0644 gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons + $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber $(Q)install -m 0644 gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber $(Q)tar -c -h -C gtk/res -f - themes | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f - - $(Q)tar -c -h -C gtk/res -f - C $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f - + $(Q)tar -c -h -C gtk/res -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f - $(call split_install_messages, gtk, $(DESTDIR)$(NETSURF_GTK_RESOURCES)) + $(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(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/C/credits.html b/gtk/res/C/credits.html deleted file mode 120000 index 1ba17392b..000000000 --- a/gtk/res/C/credits.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/en/credits.html,faf
\ No newline at end of file diff --git a/gtk/res/C/licence.html b/gtk/res/C/licence.html deleted file mode 120000 index 147dd6db2..000000000 --- a/gtk/res/C/licence.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/en/licence.html,faf
\ No newline at end of file diff --git a/gtk/res/C/welcome.html b/gtk/res/C/welcome.html deleted file mode 120000 index 28362130a..000000000 --- a/gtk/res/C/welcome.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/en/welcome.html,faf
\ No newline at end of file diff --git a/gtk/res/Messages b/gtk/res/Messages new file mode 120000 index 000000000..75bfdf53d --- /dev/null +++ b/gtk/res/Messages @@ -0,0 +1 @@ +en/Messages
\ No newline at end of file diff --git a/gtk/res/credits.html b/gtk/res/credits.html new file mode 120000 index 000000000..ca85d3d27 --- /dev/null +++ b/gtk/res/credits.html @@ -0,0 +1 @@ +en/credits.html
\ No newline at end of file diff --git a/gtk/res/licence.html b/gtk/res/licence.html new file mode 120000 index 000000000..86f8c54bf --- /dev/null +++ b/gtk/res/licence.html @@ -0,0 +1 @@ +en/licence.html
\ No newline at end of file diff --git a/gtk/res/welcome.html b/gtk/res/welcome.html new file mode 120000 index 000000000..1abdc5e8a --- /dev/null +++ b/gtk/res/welcome.html @@ -0,0 +1 @@ +en/welcome.html
\ No newline at end of file |