From a3ab1ef1a1e0b390fdbbe2534cd66a62f4c47279 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Mon, 24 Dec 2018 14:05:35 -0500
Subject: run update-desktop-database after writing firefox.desktop

---
 Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b2d8a04..285897c 100755
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ endif
 endif
 
 ifeq (0,$(shell id -u))
+ROOT_INSTALL = y
+endif
+
+ifdef ROOT_INSTALL
 optdir=/opt
 bindir=/usr/local/bin
 applications_dir=/usr/share/applications
@@ -65,6 +69,9 @@ alternatives:
 
 $(desktop_file):
 	: write file $@ $(file >$@,$(desktop_file_contents))
+ifdef ROOT_INSTALL
+	update-desktop-database
+endif
 
 $(symlink): $(destdir)
 	cd $(dir $@) && ln -sf $(notdir $(destdir)) $(notdir $@)
@@ -74,7 +81,7 @@ beta nightly stable: install
 $(destdir): $(tarball)
 	mkdir -p $(tempdir)
 	tar -C $(tempdir) --strip-components=1 -jxf $<
-	mv $(tempdir) $(destdir)
+	mv -T $(tempdir) $(destdir)
 	rm $(tarball) || true
 
 .INTERMEDIATE: $(tarball)
@@ -88,9 +95,6 @@ FIREFOX_DIR=$(optdir)/firefox
 FIREFOX_EXEC=$(FIREFOX_DIR)/firefox
 FIREFOX_ICON=$(FIREFOX_DIR)/browser/chrome/icons/default/default128.png
 
-firefox.desktop:
-	: $(file > $(desktop_file_contents))
-
 define desktop_file_contents
 [Desktop Entry]
 Name=Firefox
-- 
cgit v1.2.3