* makeFlags -> buildFlags in a few places.

svn path=/nixpkgs/trunk/; revision=7503
This commit is contained in:
Eelco Dolstra 2006-12-27 18:34:35 +00:00
parent b8b44e026c
commit f861c8b66c
17 changed files with 22 additions and 22 deletions

View File

@ -1,6 +1,6 @@
source $stdenv/setup
makeFlags="-f Makefile.bmp"
buildFlags="-f Makefile.bmp"
installPhase=installPhase
installPhase() {

View File

@ -15,5 +15,5 @@ stdenv.mkDerivation {
inherit motif;
buildInputs = [x11 motif libXpm];
makeFlags = if stdenv.system == "i686-linux" then "linux" else "";
buildFlags = if stdenv.system == "i686-linux" then "linux" else "";
}

View File

@ -48,6 +48,6 @@ postInstall() {
}
makeFlags="-f client.mk build"
buildFlags="-f client.mk build"
genericBuild

View File

@ -68,6 +68,6 @@ preConfigure() {
}
makeFlags="bootstrap"
buildFlags="bootstrap"
genericBuild

View File

@ -85,6 +85,6 @@ postConfigure() {
postConfigure=postConfigure
makeFlags="bootstrap"
buildFlags="bootstrap"
genericBuild

View File

@ -79,9 +79,9 @@ postInstall() {
#if test -z "$profiledCompiler"; then
# makeFlags="bootstrap"
# buildFlags="bootstrap"
#else
# makeFlags="profiledbootstrap"
# buildFlags="profiledbootstrap"
#fi
genericBuild

View File

@ -69,9 +69,9 @@ postInstall() {
if test -z "$profiledCompiler"; then
makeFlags="bootstrap $makeFlags"
buildFlags="bootstrap $buildFlags"
else
makeFlags="profiledbootstrap $makeFlags"
buildFlags="profiledbootstrap $buildFlags"
fi
genericBuild

View File

@ -89,9 +89,9 @@ postInstall() {
#if test -z "$profiledCompiler"; then
#makeFlags="bootstrap"
#buildFlags="bootstrap"
#else
#makeFlags="profiledbootstrap"
#buildFlags="profiledbootstrap"
#fi
genericBuild

View File

@ -92,9 +92,9 @@ postInstall() {
if test -z "$profiledCompiler"; then
makeFlags="bootstrap"
buildFlags="bootstrap"
else
makeFlags="profiledbootstrap"
buildFlags="profiledbootstrap"
fi
genericBuild

View File

@ -75,9 +75,9 @@ postInstall() {
if test -z "$staticCompiler"; then
if test -z "$profiledCompiler"; then
makeFlags="bootstrap $makeFlags"
buildFlags="bootstrap $buildFlags"
else
makeFlags="profiledbootstrap $makeFlags"
buildFlags="profiledbootstrap $buildFlags"
fi
fi

View File

@ -10,6 +10,6 @@ stdenv.mkDerivation {
configureScript = ./configure-3.08.0;
dontAddPrefix = "True";
configureFlags = ["-no-tk" "-x11lib" x11];
makeFlags = ["world" "bootstrap" "opt"];
buildFlags = ["world" "bootstrap" "opt"];
checkTarget = ["opt.opt"];
}

View File

@ -10,6 +10,6 @@ stdenv.mkDerivation {
configureScript = ./configure-3.09.1;
dontAddPrefix = "True";
configureFlags = ["-no-tk" "-x11lib" x11];
makeFlags = ["world" "bootstrap" "opt"];
buildFlags = ["world" "bootstrap" "opt"];
checkTarget = ["opt.opt"];
}

View File

@ -1,6 +1,6 @@
source $stdenv/setup
makeFlags="all so sobin"
buildFlags="all so sobin"
installFlags="INSTALL_ROOT=$out"
genericBuild

View File

@ -1,6 +1,6 @@
source $stdenv/setup
makeFlags="all so sobin"
buildFlags="all so sobin"
installFlags="soinstall INSTALL_ROOT=$out"
genericBuild

View File

@ -1,6 +1,6 @@
source $stdenv/setup
makeFlags="linux-x86"
buildFlags="linux-x86"
installPhase=installPhase
installPhase() {

View File

@ -7,5 +7,5 @@ stdenv.mkDerivation {
md5 = "a05bed4aa63637052e60690ccde70421";
};
buildInputs = [x11 libXaw];
makeFlags = "without_doc";
buildFlags = "without_doc";
}

View File

@ -1,6 +1,6 @@
source $stdenv/setup
makeFlags="-f unix/Makefile generic"
buildFlags="-f unix/Makefile generic"
installFlags="-f unix/Makefile prefix=$out INSTALL=cp"