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: [PATCH] More "make dist" fixes

---
 doc/manual/local.mk  | 4 +++-
 local.mk             | 4 +++-
 release.nix          | 7 ++++---
 src/libexpr/local.mk | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 92413eb7e2..081b985570 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -28,7 +28,7 @@ $(d)/manual.is-valid: $(d)/manual.xmli
 
 clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
 
-clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
+dist-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
 
 
 # Generate man pages.
@@ -47,6 +47,8 @@ $(man-pages): $(d)/manual.xmli $(d)/manual.is-valid
 
 clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
 
+dist-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
+
 
 # Generate the HTML manual.
 $(d)/manual.html: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid
diff --git a/local.mk b/local.mk
index 6c99ab2332..174e6150e0 100644
--- a/local.mk
+++ b/local.mk
@@ -1,3 +1,5 @@
 dist-files += $(shell git ls-files) $(shell git ls-files)
 
-GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
+dist-files += configure config.h.in
+
+GLOBAL_CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
diff --git a/release.nix b/release.nix
index 29bceca7c7..8d395189e2 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;
diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk
index 85e476e39b..431f84b099 100644
--- a/src/libexpr/local.mk
+++ b/src/libexpr/local.mk
@@ -20,3 +20,5 @@ $(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l
 	$(trace-gen) flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $<
 
 clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh
+
+dist-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh