SPECS: VirtualBox.spec - there are different output dirs for amd64...

[hawk]

Author: hawk                         Date: Fri Jan 19 13:22:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- there are different output dirs for amd64 and x86 builds

---- Files affected:
SPECS:
   VirtualBox.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.1 SPECS/VirtualBox.spec:1.2
--- SPECS/VirtualBox.spec:1.1	Fri Jan 19 13:50:26 2007
+++ SPECS/VirtualBox.spec	Fri Jan 19 14:22:23 2007
@@ -50,6 +50,12 @@
 ExclusiveArch:	%{ix86} amd64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch amd64
+%define		_outdir	amd64
+%else
+%define		_outdir	x86
+%endif
+
 %description
 InnoTek VirtualBox is a general-purpose full virtualizer for x86
 hardware. Targeted at server, desktop and embedded use, it is now the
@@ -141,7 +147,7 @@
 . ./env.sh
 kmk
 
-cd out/linux.x86/release/bin/src
+cd out/linux.%{_outdir}/release/bin/src
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
@@ -180,17 +186,17 @@
 	$RPM_BUILD_ROOT%{_bindir} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
-install out/linux.x86/release/bin/{VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox} \
+install out/linux.%{_outdir}/release/bin/{VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox} \
 	$RPM_BUILD_ROOT%{_bindir}
-install out/linux.x86/release/bin/VBox{DD,DD2,REM,REMImp,RT,VMM,XML,XPCOM,XPCOMIPCC}.so \
+install out/linux.%{_outdir}/release/bin/VBox{DD,DD2,REM,REMImp,RT,VMM,XML,XPCOM,XPCOMIPCC}.so \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
-install out/linux.x86/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0}} \
+install out/linux.%{_outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0}} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 %if %{with smp} && %{with dist_kernel}
-install out/linux.x86/release/bin/src/vboxdrv-smp.ko \
+install out/linux.%{_outdir}/release/bin/src/vboxdrv-smp.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vboxdrv.ko
 %endif
 %endif
@@ -233,6 +239,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007/01/19 13:22:23  hawk
+- there are different output dirs for amd64 and x86 builds
+
 Revision 1.1  2007/01/19 12:50:26  hawk
 - VirtualBox is now licensed under GPLv2 so here is spec for it
 - no official source tarballs are available, SVN snapshot was used
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/VirtualBox.spec?r1=1.1&r2=1.2&f=u