sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79134 by Eric Sandall for review

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>, "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 79134 by Eric Sandall for review
Date: Thu, 11 May 2006 16:50:01 +0100 (BST)

Change 79134 by eric_sandall@sandalle-isp38 on 2006/05/11 16:45:34

* INSTALL: Use $X_PRE instead of $INSTALL_ROOT/usr/X11R6 and
$X_MOD
instead of $INSTALL_ROOT/usr/X11R6/lib/modules to not break
xorg-modular (Thanks to Robin Cook for pointing out that I
broke
xorg-modular ;))

Affected files ...

... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#34 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#14 edit

Differences ...

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#34 (text) ====

@@ -1,3 +1,9 @@
+2006-05-11 Eric Sandall <eric AT sandall.us>
+ * INSTALL: Use $X_PRE instead of $INSTALL_ROOT/usr/X11R6 and $X_MOD
+ instead of $INSTALL_ROOT/usr/X11R6/lib/modules to not break
+ xorg-modular (Thanks to Robin Cook for pointing out that I broke
+ xorg-modular ;))
+
2006-05-10 Eric Sandall <eric AT sandall.us>
* PREPARE: Remove check for running X, no longer needed
* PRE_BUILD: Setup Makefile -> Makefile.kbuild symlink in usr/src/nv

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#14 (xtext)
====

@@ -42,11 +42,11 @@
# Install OpenGL headers
#
pushd $SOURCE_DIRECTORY/usr/include/GL &&
-if [ ! -d $INSTALL_ROOT/usr/X11R6/include/GL ]; then
- mkdir -p $INSTALL_ROOT/usr/X11R6/include/GL
+if [ ! -d $X_PRE/include/GL ]; then
+ mkdir -p $X_PRE/include/GL
fi &&
for file in glext.h gl.h glxext.h glx.h; do
- install -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/X11R6/include/GL/
+ install -m 0644 -o root -g root $file $X_PRE/include/GL/
done &&
popd &&

@@ -86,12 +86,12 @@
#
pushd $SOURCE_DIRECTORY/usr/X11R6/lib &&
for lib in libXvMCNVIDIA.a libXvMCNVIDIA.so.${VERSION/-/.}; do
- install -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/X11R6/lib
+ install -m 0644 -o root -g root $lib $X_PRE/lib
done &&
#
# Setup symlinks
#
- pushd $INSTALL_ROOT/usr/X11R6/lib &&
+ pushd $X_PRE/lib &&
ln -sfn libXvMCNVIDIA.so.${VERSION/-/.} libXvMCNVIDIA_dynamic.so.1 &&
popd &&
popd &&
@@ -102,14 +102,14 @@
pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules &&
for driver in nvidia_drv.o nvidia_drv.so; do
install -m 0644 -o root -g root drivers/$driver \
- $INSTALL_ROOT/usr/X11R6/lib/modules/drivers
+ $X_MOD/drivers
done &&
install -m 0644 -o root -g root extensions/libglx.so.${VERSION/-/.} \
- $INSTALL_ROOT/usr/X11R6/lib/modules/extensions &&
+ $X_MOD/extensions &&
#
# Setup extension symlink
#
- pushd $INSTALL_ROOT/usr/X11R6/lib/modules/extensions &&
+ pushd $X_MOD/extensions &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
popd &&
popd &&

[SM-Commit] PERFORCE change 79134 by Eric Sandall for review, Perforce Review Daemon, 05/11/2006