Adding settings.in rule; fixing hsts_preload.h output directory

3 files changed, 7 insertions, 55 deletions

diff --git a/util/Makefile b/util/Makefile
index 711761b1..3a137aa3 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -15,7 +15,12 @@ $(SETTINGS): settings.in
 	@echo gen settings.html
 	@awk -f generate_settings.awk $< > $@
 
+settings.in: settings.pre
+	@$(shell if pkg-config --exists 'libsoup-2.4 >= 2.38'; then \
+		sed 's/^SSL_CERTIFICATION/ssl-use-system-ca-file checkbox Whether to use the system certification file/' $< > $@;\
+		else  sed 's/^SSL_CERTIFICATION/ssl-ca-file text Path to ssl-certificate/;/^addressbar-dns-lookup/d' $< > $@; fi)
+
 clean: 
-	$(RM) $(OUTFILES)
+	$(RM) $(OUTFILES) settings.in
 
 .PHONY: clean
diff --git a/util/convert_keys.sh b/util/convert_keys.sh
deleted file mode 100755
index 3c33e70a..00000000
--- a/util/convert_keys.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-
-declare -A map
-
-INPUT="$XDG_CONFIG_HOME/dwb/keys"
-[ "$1" ] && INPUT="$1"
-
-
-map=(
-[open_url]=Open 
-[tabopen]=open_nv 
-[tabopen_url]=Open_nv 
-[winopen]=open_nw 
-[winopen_url]=Open_nw 
-[tab_hist_back]=history_back_nv
-[tab_hist_forward]=history_forward_nv
-[win_hist_back]=history_back_nw 
-[win_hist_forward]=history_forward_nw
-[hints]=hint_mode
-[hints_tab]=hint_mode_nv
-[hints_win]=hint_mode_nw
-[hints_links]=hint_mode_links
-[hints_images]=hint_mode_images
-[hints_images_tab]=hint_mode_images_nv
-[hints_editable]=hint_mode_editable
-[hints_url]=hint_mode_url
-[hints_url_tab]=hint_mode_url_nv
-[hints_download]=hint_mode_download
-[hints_clipboard]=hint_mode_clipboard
-[hints_primary]=hint_mode_primary
-[hints_rapid]=hint_mode_rapid
-[hints_rapid_win]=hint_mode_rapid_nw
-[tab_bookmarks]=bookmarks_nv
-[win_bookmarks]=bookmarks_nw
-[quickmark]=open_quickmark
-[tab_quickmark]=open_quickmark_nv
-[win_quickmark]=open_quickmark_nw
-[start_page]=open_start_page
-[tab_new]=add_view
-[close_tab]=remove_view
-[focus_tab]=focus_nth_view
-[tab_paste]=past_nv
-[win_paste]=paste_nw
-[tab_paste_primary]=paste_primary_nw
-[win_paste_primary]=paste_primary_nv
-[new_tab]=new_view
-[new_win]=new_window
-)
-
-for key in ${!map[@]}; do 
-  sed -i "s/${map[$key]}/$key/" "${INPUT}"
-done
diff --git a/util/src/Makefile b/util/src/Makefile
index 6c25ca7e..d8d8b84b 100644
--- a/util/src/Makefile
+++ b/util/src/Makefile
@@ -8,7 +8,7 @@ MKTLDS=mktlds-header
 MKTLDS_SRC=mktlds-header.c
 
 HSTS=convert_transport_security
-HSTS_PRELOAD=$(BASE_DIR)/hsts_preload.h
+HSTS_PRELOAD=$(BASE_DIR)/$(SRCDIR)/hsts_preload.h
 TRANSPORT_SECURITY_JSON=transport_security_state_static.json
 TRANSPORT_SECURITY_CERTS=transport_security_state_static.certs