TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More "make dist" fixes

This commit is contained in:
Eelco Dolstra 2014-02-01 15:18:48 +01:00
parent 74ca70da3a
commit 844d83352c
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/manual/local.mk
View File

@ -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
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. # Generate man pages.
@ -47,6 +47,8 @@ $(man-pages): $(d)/manual.xmli $(d)/manual.is-valid
clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8 clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
dist-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
# Generate the HTML manual. # Generate the HTML manual.
$(d)/manual.html: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid $(d)/manual.html: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid

4
local.mk
View File

@ -1,3 +1,5 @@
dist-files += $(shell git ls-files) $(shell git ls-files) 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

7
release.nix
View File

@ -48,14 +48,13 @@ let
distPhase = distPhase =
'' ''
runHook preDist runHook preDist
make dist-gzip make dist
make dist-xz
mkdir -p $out/tarballs mkdir -p $out/tarballs
cp *.tar.* $out/tarballs cp *.tar.* $out/tarballs
''; '';
preDist = '' 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 make doc/manual/manual.pdf
cp doc/manual/manual.pdf $out/manual.pdf cp doc/manual/manual.pdf $out/manual.pdf
@ -98,6 +97,8 @@ let
makeFlags = "profiledir=$(out)/etc/profile.d"; makeFlags = "profiledir=$(out)/etc/profile.d";
preBuild = "unset NIX_INDENT_MAKE";
installFlags = "sysconfdir=$(out)/etc"; installFlags = "sysconfdir=$(out)/etc";
doInstallCheck = true; doInstallCheck = true;

2
src/libexpr/local.mk
View File

@ -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 $< $(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 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