diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01 15:18:48 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01 15:18:48 +0100 |
| commit | 844d83352c23db4a3131ac2b11b9ed2af03cdfd6 (patch) | |
| tree | d689b99ad62cb9187dfdcd593ac7658265ae48ae | |
| parent | 74ca70da3a6d2f110a9dccf15c46422b1b078e3f (diff) | |
More "make dist" fixes
| -rw-r--r-- | doc/manual/local.mk | 4 | ||||
| -rw-r--r-- | local.mk | 4 | ||||
| -rw-r--r-- | release.nix | 7 | ||||
| -rw-r--r-- | 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 92413eb7e..081b98557 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 @@ -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 29bceca7c..8d395189e 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 85e476e39..431f84b09 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 |