[SM-Commit] GIT changes to master xorg-modular grimoire by Pol Vinogradov (141cf19426ee4ba653c56c13fcb07bbded6226e0)

Pol Vinogradov scm at mail.sourcemage.org
Sun Oct 29 18:17:44 EST 2006


GIT changes to master xorg-modular grimoire by Pol Vinogradov <vin.public at gmail.com>:

 xorg-xserver/xorg-server/FINAL   |   12 ++++++++----
 xorg-xserver/xorg-server/HISTORY |    5 +++++
 xorg-xserver/xorg-server/INSTALL |    4 ----
 3 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 141cf19426ee4ba653c56c13fcb07bbded6226e0
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    xorg-xserver/xorg-server:
    
    INSTALL: removed, code now in FINAL
    FINAL: added mv statements, etc from INSTALL to make it work with
    staged install

diff --git a/xorg-xserver/xorg-server/FINAL b/xorg-xserver/xorg-server/FINAL
index 08f6e69..444dedd 100755
--- a/xorg-xserver/xorg-server/FINAL
+++ b/xorg-xserver/xorg-server/FINAL
@@ -1,8 +1,12 @@
-rm -rf ${SOURCE2_DIRECTORY}  &&
+mkdir -vp  $INSTALL_ROOT/usr/lib/xorg/modules/extensions/mesa      &&
+mv -vf $TRACK_ROOT/usr/lib/xorg/modules/extensions/libglx.*        \
+       $INSTALL_ROOT/usr/lib/xorg/modules/extensions/mesa/         &&
+
+rm -rf ${SOURCE2_DIRECTORY}                                        &&
 #smgl-gl_select -s mesa
 #Temporary until this is finalized by the smgl-gl_select
-ln -vfs ${TRACK_ROOT}/usr/include/GL/mesa/*.h                    \
-        ${TRACK_ROOT}/usr/include/GL/                            &&
-ln -vfs ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/mesa/*     \
+ln -vfs ${TRACK_ROOT}/usr/include/GL/mesa/*.h                      \
+        ${TRACK_ROOT}/usr/include/GL/                              &&
+ln -vfs ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/mesa/*       \
         ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/
 
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 893410b..75c5770 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,8 @@
+2006-10-30 Pol Vinogradov <vin.public at gmail.com>
+	* INSTALL: removed, code now in FINAL
+	* FINAL: added mv statements, etc from INSTALL to make it work with
+	  staged install
+
 2006-10-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* INSTALL: no more bothering with libGLcore
 
diff --git a/xorg-xserver/xorg-server/INSTALL b/xorg-xserver/xorg-server/INSTALL
deleted file mode 100755
index 4e01fa0..0000000
--- a/xorg-xserver/xorg-server/INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-default_install                                                    &&
-mkdir -vp  $INSTALL_ROOT/usr/lib/xorg/modules/extensions/mesa      &&
-mv -vf $INSTALL_ROOT/usr/lib/xorg/modules/extensions/libglx.*      \
-       $INSTALL_ROOT/usr/lib/xorg/modules/extensions/mesa/



More information about the SM-Commit mailing list