summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile30
-rw-r--r--Makefile.config3
2 files changed, 18 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 27b2c93aa..876e679c4 100644
--- a/Makefile
+++ b/Makefile
@@ -549,21 +549,21 @@ $(eval $(foreach SOURCE,$(filter %.s,$(SOURCES)), \
clean: $(CLEANS)
install-gtk:
- mkdir -p $(DESTDIR)/usr/share/netsurf/throbber
- mkdir -p $(DESTDIR)/usr/bin
- @cp -v nsgtk $(DESTDIR)/usr/bin
- @cp -vrL gtk/res/adblock.css $(DESTDIR)/usr/share/netsurf
- @cp -vrL gtk/res/ca-bundle.txt $(DESTDIR)/usr/share/netsurf
- @cp -vrL gtk/res/default.css $(DESTDIR)/usr/share/netsurf
- @cp -vrL gtk/res/gtkdefault.css $(DESTDIR)/usr/share/netsurf
- @cp -vrL gtk/res/license $(DESTDIR)/usr/share/netsurf
- @cp -vrL gtk/res/netsurf.xpm $(DESTDIR)/usr/share/netsurf
- @cp -vrL gtk/res/netsurf-16x16.xpm $(DESTDIR)/usr/share/netsurf
- @cp -vrL gtk/res/throbber/*.png $(DESTDIR)/usr/share/netsurf/throbber
- gzip -9v < gtk/res/messages > $(DESTDIR)/usr/share/netsurf/messages
- gzip -9v < gtk/res/downloads.glade > $(DESTDIR)/usr/share/netsurf/downloads.glade
- gzip -9v < gtk/res/netsurf.glade > $(DESTDIR)/usr/share/netsurf/netsurf.glade
- gzip -9v < gtk/res/options.glade > $(DESTDIR)/usr/share/netsurf/options.glade
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
+ @cp -v nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
+ @cp -vrL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -vrL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -vrL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -vrL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -vrL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -vrL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -vrL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -vrL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
+ gzip -9v < gtk/res/messages > $(DESTDIR)$(NETSURF_GTK_RESOURCES)messages
+ gzip -9v < gtk/res/downloads.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)downloads.glade
+ gzip -9v < gtk/res/netsurf.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)netsurf.glade
+ gzip -9v < gtk/res/options.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)options.glade
install: all-program install-$(TARGET)
diff --git a/Makefile.config b/Makefile.config
index 106de03e6..8b2b978ab 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -68,6 +68,9 @@ ifeq ($(TARGET),gtk)
# Where to search for NetSurf's resources after looking in ~/.netsurf and
# $NETSURFRES. It must have a trailing /
NETSURF_GTK_RESOURCES := /usr/local/share/netsurf/
+
+ # Where to install the netsurf binary
+ NETSURF_GTK_BIN := /usr/local/bin/
# Use librsvg in conjunction with Cairo to render SVG images
# Valid options: YES, NO, AUTO