[Robotflow-cvs] RobotFlow RobotFlow.spec.in,1.2,1.3

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

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

Modified Files:
	RobotFlow.spec.in 
Log Message:
now working make rpm

Index: RobotFlow.spec.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/RobotFlow.spec.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RobotFlow.spec.in	31 May 2004 12:31:40 -0000	1.2
--- RobotFlow.spec.in	31 May 2004 20:15:31 -0000	1.3
***************
*** 2,5 ****
--- 2,12 ----
  %define ver      @VERSION@
  %define rel      1
+ %define _prefix   /usr/lib/flowdesigner/toolbox/RobotFlow
+ %define _datadir  %{_prefix}
+ %define _bindir   %{_prefix}/bin
+ %define _includedir %{_prefix}/include
+ %define _libdir		%{_prefix}/lib
+ %define _mandir		%{_prefix}/man
+ %define _sysconfdir %{_prefix}/etc
  
  Summary: A Robotics Toolkit for FlowDesigner
***************
*** 27,39 ****
  %prep
  %setup
- 
  %build
  export CXXFLAGS='-O3 -march=pentium'
  export CFLAGS='-O3 -march=pentium'
! ./configure --prefix=/usr/lib/flowdesigner/toolbox/RobotFlow --disable-static
  %{__make}
  
  %install
! %makeinstall
  
  %post -p /sbin/ldconfig
--- 34,60 ----
  %prep
  %setup
  %build
+ 
  export CXXFLAGS='-O3 -march=pentium'
  export CFLAGS='-O3 -march=pentium'
! 
! ./configure --prefix=%{_prefix} \
! 	--bindir=%{_bindir} \
! 	--datadir=%{_datadir} \
! 	--includedir=%{_includedir} \
! 	--libdir=%{_libdir} \
! 	--mandir=%{_mandir} \
! 	--sysconfdir=%{_sysconfdir} \
! 	--disable-static
! 
  %{__make}
  
  %install
! rm -rf %{buildroot}
! make prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} \
!      datadir=%{buildroot}%{_datadir} includedir=%{buildroot}%{_includedir} \
!      libdir=%{buildroot}%{_libdir} mandir=%{buildroot}%{_mandir} \
!      sysconfdir=%{buildroot}%{_sysconfdir} \
!      install
  
  %post -p /sbin/ldconfig
***************
*** 42,45 ****
  %files
  %defattr(-, root, root, 0755)
! /usr/lib/flowdesigner/toolbox/RobotFlow/*
  
--- 63,69 ----
  %files
  %defattr(-, root, root, 0755)
! 
! %{_datadir}/*
! %{_libdir}/*
! %{_includedir}/*