More "make dist" fixes

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

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

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;

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