From 94b7c09a14f4f554fda6fc2c7fce65d64246344a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 3 Nov 2015 10:38:08 -0400 Subject: Avoid installing desktop file and program file if cabal install git-annex is run as root, since that is not a systemwide install, but to /root, and so generating a systemwide desktop file is not right. --- Setup.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Setup.hs') diff --git a/Setup.hs b/Setup.hs index f0c9fb4eb..a3c1f1cf6 100644 --- a/Setup.hs +++ b/Setup.hs @@ -64,7 +64,7 @@ installManpages copyDest verbosity pkg lbi = installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () installDesktopFile copyDest _verbosity pkg lbi | progfile copyDest == progfile NoCopyDest = - DesktopFile.install (progfile copyDest) + DesktopFile.installUser (progfile copyDest) | otherwise = return () where progfile cd = bindir (absoluteInstallDirs pkg lbi cd) "git-annex" -- cgit v1.2.3