From 844d83352c23db4a3131ac2b11b9ed2af03cdfd6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 1 Feb 2014 15:18:48 +0100
Subject: More "make dist" fixes

---
 release.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'release.nix')

diff --git a/release.nix b/release.nix
index 29bceca7c722..8d395189e248 100644
--- a/release.nix
+++ b/release.nix
@@ -48,14 +48,13 @@ let
         distPhase =
           ''
             runHook preDist
-            make dist-gzip
-            make dist-xz
+            make dist
             mkdir -p $out/tarballs
             cp *.tar.* $out/tarballs
           '';
 
         preDist = ''
-          make install prefix=$out makefiles=doc/manual/local.mk
+          make install docdir=$out/share/doc/nix makefiles=doc/manual/local.mk
 
           make doc/manual/manual.pdf
           cp doc/manual/manual.pdf $out/manual.pdf
@@ -98,6 +97,8 @@ let
 
         makeFlags = "profiledir=$(out)/etc/profile.d";
 
+        preBuild = "unset NIX_INDENT_MAKE";
+
         installFlags = "sysconfdir=$(out)/etc";
 
         doInstallCheck = true;
-- 
cgit 1.4.1