CVS: crater/x11-apps/openoffice-src BUILD, 1.10, 1.11 build-ooo, 1.6, 1.7

[nhudson at lunar-linux.org]

Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv22172

Modified Files:
	BUILD build-ooo 
Log Message:

niki these changes should help you get past the problem you have having building this.  You can thank elaine for figuring it out :)


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- BUILD	18 Aug 2003 03:02:21 -0000	1.10
+++ BUILD	20 Aug 2003 03:07:08 -0000	1.11
@@ -23,7 +23,9 @@
   cp $SCRIPT_DIRECTORY/scale-icons $SOURCE_DIRECTORY/bin &&
   cd $SOURCE_DIRECTORY &&
 
-  default_make  
+  ./var/lib/lunar/unset.sh && make &&
+  prepare_install                  &&
+  make install                     
 
   
 ) > $C_FIFO 2>&1

Index: build-ooo
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/build-ooo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- build-ooo	18 Aug 2003 03:02:21 -0000	1.6
+++ build-ooo	20 Aug 2003 03:07:08 -0000	1.7
@@ -125,7 +125,7 @@
             tar $GCC_UNTAR_OPTIONS $SRCDIR/$GCC_TARBALL || exit 1;
         fi
         cd $PKG_VER
-        ./configure --prefix=$BUILDDIR || exit 1;
+        ./configure --prefix=$BUILDDIR --enable-static --disable-shared --enable-languages=c++ || exit 1;
         make && make install || exit 1;
         touch $BUILDDIR/$PKG_VER/$STAMP
 fi