[Robotflow-cvs] RobotFlow RobotFlow.spec.in,1.1,1.2 configure.in,1.36,1.37

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23844

Modified Files:
	RobotFlow.spec.in configure.in 
Log Message:
using the prefix specified by the user

Index: RobotFlow.spec.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/RobotFlow.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RobotFlow.spec.in	30 May 2004 10:19:19 -0000	1.1
--- RobotFlow.spec.in	31 May 2004 12:31:40 -0000	1.2
***************
*** 31,35 ****
  export CXXFLAGS='-O3 -march=pentium'
  export CFLAGS='-O3 -march=pentium'
! ./configure --prefix=/usr --disable-static
  %{__make}
  
--- 31,35 ----
  export CXXFLAGS='-O3 -march=pentium'
  export CFLAGS='-O3 -march=pentium'
! ./configure --prefix=/usr/lib/flowdesigner/toolbox/RobotFlow --disable-static
  %{__make}
  

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** configure.in	30 May 2004 14:13:57 -0000	1.36
--- configure.in	31 May 2004 12:31:41 -0000	1.37
***************
*** 195,199 ****
  XML2_LIB=`$XML2_CONFIG --libs`
  
! prefix=$OVERFLOW_DATA/$PACKAGE
  
  AC_SUBST(GNOME_LIB)
--- 195,206 ----
  XML2_LIB=`$XML2_CONFIG --libs`
  
! 
! dnl Look for prefix, if not specified, use FlowDesigner default toolbox prefix
! if test "x$prefix" = "xNONE"; then
!   prefix=$OVERFLOW_DATA/$PACKAGE                      
! else
!   dnl this will work, but we should maybe change the variable name
!   OVERFLOW_DATA=$prefix
! fi
  
  AC_SUBST(GNOME_LIB)
***************
*** 277,278 ****
--- 284,287 ----
  fi
  
+ AC_MSG_RESULT([$PACKAGE will be installed in : $prefix])
+