[Lunar-commits] CVS: theedge/var/lib/lunar/functions build.lunar, 1.19, 1.20 modules.lunar, 1.36, 1.37

[Auke Kok]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv4977/var/lib/lunar/functions

Modified Files:
	build.lunar modules.lunar 
Log Message:
* Adding preliminary _PREFIX work (works!)
* Fixing mosrun caller to check for openmosix-tools instead of linux-openmosix.


Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- build.lunar	3 Mar 2004 21:51:07 -0000	1.19
+++ build.lunar	24 Mar 2004 12:33:53 -0000	1.20
@@ -151,14 +151,14 @@
 
   verbose_msg "CFLAGS=\"$CFLAGS\""            &&
   verbose_msg "OPTS=\"$OPTS\""                &&
-  verbose_msg "./configure --build=$BUILD --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=/usr/share/info --mandir=/usr/share/man $OPTS"
+  verbose_msg "./configure --build=$BUILD --prefix=$MODULE_PREFIX --sysconfdir=/etc --localstatedir=/var --infodir=$MODULE_PREFIX/share/info --mandir=$MODULE_PREFIX/share/man $OPTS"
 
-  ./configure  --build=$BUILD            \
-               --prefix=/usr             \
-               --sysconfdir=/etc         \
-               --localstatedir=/var      \
-               --infodir=/usr/share/info \
-               --mandir=/usr/share/man   \
+  ./configure  --build=$BUILD                      \
+               --prefix=$MODULE_PREFIX             \
+               --sysconfdir=/etc                   \
+               --localstatedir=/var                \
+               --infodir=$MODULE_PREFIX/share/info \
+               --mandir=$MODULE_PREFIX/share/man   \
                $OPTS
 } > $C_FIFO 2>&1
 
@@ -168,14 +168,14 @@
   verbose_msg "running \"default_cvs_config\""
   verbose_msg "CFLAGS=\"$CFLAGS\""            &&
   verbose_msg "OPTS=\"$OPTS\""                &&
-  verbose_msg "./autogen.sh --build=$BUILD --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=/usr/share/info --mandir=/usr/share/man $OPTS"
+  verbose_msg "./autogen.sh --build=$BUILD --prefix=$MODULE_PREFIX --sysconfdir=/etc --localstatedir=/var --infodir=$MODULE_PREFIX/share/info --mandir=$MODULE_PREFIX/share/man $OPTS"
 
-  ./autogen.sh --build=$BUILD            \
-               --prefix=/usr             \
-               --sysconfdir=/etc         \
-               --localstatedir=/var      \
-               --infodir=/usr/share/info \
-               --mandir=/usr/share/man   \
+  ./autogen.sh --build=$BUILD                      \
+               --prefix=$MODULE_PREFIX             \
+               --sysconfdir=/etc                   \
+               --localstatedir=/var                \
+               --infodir=$MODULE_PREFIX/share/info \
+               --mandir=$MODULE_PREFIX/share/man   \
                $OPTS
 } > $C_FIFO 2>&1
 
@@ -185,7 +185,7 @@
   verbose_msg "running \"default_make\""
   # This code is simular to the optimize_make function from optimize.lunar
   # This is needed because bash does not expand aliases in functions
-  if module_installed linux-openmosix ; then
+  if module_installed openmosix-tools ; then
     if [[ "$MAKES" > 1 ]] ; then
       mosrun -h make -j$MAKES
     else

Index: modules.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/modules.lunar,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- modules.lunar	21 Mar 2004 22:17:24 -0000	1.36
+++ modules.lunar	24 Mar 2004 12:33:53 -0000	1.37
@@ -210,6 +210,7 @@
     SOURCE_DIRECTORY=${SOURCE_DIRECTORY:-$BUILD_DIRECTORY/$1-$VERSION}
     mod_v_safe_edit $1 
     MODULE_CONFIG=${MODULE_CONFIG:-$DEPENDS_CONFIG/$MOD_V_SNAME}
+    MODULE_PREFIX=${MODULE_PREFIX:-$DEFAULT_PREFIX}
 
     return 0
   fi