forked from mirrors/nixpkgs
* Remove makeFlags/installFlags redundancy.
svn path=/nixpkgs/trunk/; revision=7501
This commit is contained in:
parent
bbe62e266b
commit
cd32e67b2b
|
@ -8,6 +8,4 @@ preBuild() {
|
|||
|
||||
makeFlagsArray=(V=1 prefix=$out SHLIBDIR=$out/lib)
|
||||
|
||||
installFlagsArray=("${makeFlagsArray[@]}")
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -7,5 +7,5 @@ stdenv.mkDerivation {
|
|||
md5 = "7360ce47b5ec3f9fa71f18071ecb8b97";
|
||||
};
|
||||
preBuild = "makeFlagsArray=(etcdir=$out/etc sbindir=$out/sbin usrbindir=$out/bin usrsbindir=$out/sbin mandir=$out/share/man INSTALL='install -c')";
|
||||
preInstall = "installFlagsArray=(\"\${makeFlagsArray[@]}\" udevdir=dummy)";
|
||||
preInstall = "installFlagsArray=(udevdir=dummy)";
|
||||
}
|
||||
|
|
|
@ -12,7 +12,6 @@ stdenv.mkDerivation {
|
|||
|
||||
preBuild = "
|
||||
makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt)
|
||||
installFlagsArray=(\"\${makeFlagsArray[@]}\")
|
||||
";
|
||||
|
||||
# Hack to get static builds to work.
|
||||
|
|
Loading…
Reference in a new issue