Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] PERFORCE change 79315 by John Harding for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <eric AT sandall.us>
  • To: SM-Commit Daemon <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] PERFORCE change 79315 by John Harding for review
  • Date: Mon, 15 May 2006 10:41:50 -0700

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Perforce Review Daemon wrote:
> Change 79315 by john_harding@john_harding-iowa1000 on 2006/05/14 17:33:10
>
> api2 conversion, added depends g++
>
> Affected files ...
>
> ... //sgl/grimoires/games/games-board/eboard/BUILD#2 edit
> ... //sgl/grimoires/games/games-board/eboard/DEPENDS#2 edit
> ... //sgl/grimoires/games/games-board/eboard/DETAILS#3 edit
> ... //sgl/grimoires/games/games-board/eboard/HISTORY#3 edit
>
> Differences ...
>
> ==== //sgl/grimoires/games/games-board/eboard/BUILD#2 (xtext) ====
>
> @@ -1,12 +1,6 @@
> -(
> -
> - ./configure --build=$BUILD \
> - --prefix=${INSTALL_ROOT}/usr \
> - --bindir=${INSTALL_ROOT}/usr/games \
> - --mandir=${INSTALL_ROOT}/usr/share/man \
> - $OPTS &&
> - make &&
> - prepare_install &&
> - make install
> -
> -) > $C_FIFO 2>&1
> +./configure $OPTS
> &&
> +sedit "s:prefix\s*=\s*/usr/local:prefix=/usr:"
> Makefile &&
> +sedit "s:bindir\s*=\s*/usr/local/bin:bindir=/usr/games:"
> Makefile &&
> +sedit "s:mandir\s*=\s*/usr/local/man:mandir=/usr/share/man:"
> Makefile &&
> +sedit
> "s:datadir\s*=\s*/usr/local/share/eboard:datadir=/usr/share/games/eboard:"
> Makefile &&
> +make
<snip>

You should instead use default_games_build:
games/FUNCTIONS:
#---
## @Synopsis default_games_build function to replace
## @Synopsis all the duplication of the same stuff in games-grimoire
#---

function default_games_build() {
OPTS="$OPTS --bindir=${INSTALL_ROOT}/usr/games \
--datadir=${INSTALL_ROOT}/usr/share/games \
--localstatedir=${INSTALL_ROOT}/var/games" &&
default_build
}

Or modify your OPTS accordingly, rather than using sedits.

- -sandalle

- --
Eric Sandall | Source Mage GNU/Linux Developer
eric AT sandall.us | http://www.sourcemage.org/
http://eric.sandall.us/ | SysAdmin @ Shock Physics @ WSU
http://counter.li.org/ #196285 | http://www.shock.wsu.edu/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEaL1eHXt9dKjv3WERAiHHAJwK1SFK5WD10B0wFaC8eiJcxIFVYwCdHYNY
4Dp97bA3BQweOODCREbzGRM=
=Pi3f
-----END PGP SIGNATURE-----




Archive powered by MHonArc 2.6.24.

Top of Page