Apply xsconsole.hg csets 344533b9b029 and 46ffb080583b for 64 bit use

jamesbulpin · Jul 5, 2013 · d3e9e0f · d3e9e0f
1 parent 1713ba9
commit d3e9e0f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # Copyright (c) Citrix Systems 2007
 
 PREFIX=$(DESTDIR)/usr
-LIBDIR=$(DESTDIR)/usr/lib/
+LIBDIR=$(DESTDIR)/usr/lib64/
 
 INSTALL=/usr/bin/install
 

diff --git a/mk/xsconsole-plugins-oem.spec.in b/mk/xsconsole-plugins-oem.spec.in
@@ -17,7 +17,7 @@ OEM-specific plugins for xsconsole - a console tool for configuring a XenServer
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/lib
+mkdir -p $RPM_BUILD_ROOT/usr/lib64
 make install-oem DESTDIR=$RPM_BUILD_ROOT
 
 %clean

diff --git a/mk/xsconsole.spec.in b/mk/xsconsole.spec.in
@@ -17,7 +17,7 @@ Console tool for configuring a XenServer installation.
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/lib
+mkdir -p $RPM_BUILD_ROOT/usr/lib64
 make install-base DESTDIR=$RPM_BUILD_ROOT
 
 %clean

diff --git a/xsconsole b/xsconsole
@@ -4,4 +4,4 @@ if [ "$USER" = "" ]; then
   export USER=root
 fi
 
-exec /usr/bin/python /usr/lib/xsconsole/XSConsole.py $@
+exec /usr/bin/python /usr/lib64/xsconsole/XSConsole.py $@