From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 78697 by Robin Cook for review
Date: Sun, 30 Apr 2006 20:05:02 +0100 (BST)
Change 78697 by robin_cook AT CuZnDragon-pheuri.wyrms.net on 2006/04/30 20:04:02
@@ -1,3 +1,9 @@
+2006-04-30 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: uncommented the X11-SERVER depends
+ * INSTALL: added X_PRE and X_MOD to local variables
+ added if to test for xorg-modular and set X_PRE and X_MOD
+ changed nvidia_install command to use X_PRE and X_MOD
+
2006-04-18 Juuso Alasuutari <iuso AT sourcemage.org>
* INSTALL: Made sure that if the xorg.conf auto-edit option has
been selected once, it doesn't default to y on next cast.
@@ -1,12 +1,19 @@
-local e X &&
-if [[ $EXPERT == y ]]; then e='-e'; fi &&
-if [[ $XCONF == y ]]; then X='-X'; fi &&
+local e X X_PRE X_MOD &&
+if [[ $EXPERT == y ]]; then e='-e'; fi &&
+if [[ $XCONF == y ]]; then X='-X'; fi &&
+
+if test "$(get_spell_provider $SPELL X11-SERVER)" = xorg-server; then
+ X_PRE="${INSTALL_ROOT}$(pkg-config --variable=prefix xorg-server)" &&
+ X_MOD="${INSTALL_ROOT}$(pkg-config --variable=moduledir xorg-server)" &&
+else
+ X_PRE="${INSTALL_ROOT}/usr/X11R6" &&
+ X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules" &&
+fi &&