Move over to using SBINDIR for installing xapi

SBINDIR is currently set to the same as BINDIR

Signed-off-by: Jon Ludlam <[email protected]>

Author: Jon Ludlam

Makefile

@@ -38,8 +38,9 @@ SHAREDIR=/opt/xensource
 WEBDIR=/opt/xensource/www
 XHADIR=/opt/xensource/xha
 BINDIR=/opt/xensource/bin
+SBINDIR=/opt/xensource/bin
 
-export VARDIR ETCDIR OPTDIR PLUGINDIR HOOKSDIR INVENTORY VARPATCHDIR LIBEXECDIR XAPICONF SCRIPTSDIR SHAREDIR WEBDIR XHADIR BINDIR
+export VARDIR ETCDIR OPTDIR PLUGINDIR HOOKSDIR INVENTORY VARPATCHDIR LIBEXECDIR XAPICONF SCRIPTSDIR SHAREDIR WEBDIR XHADIR BINDIR SBINDIR
 
 .PHONY: all
 all: version ocaml/fhs.ml
@@ -124,6 +125,7 @@ ocaml/fhs.ml :
 	let webdir=\"$(WEBDIR)\"\n \
 	let xhadir=\"$(XHADIR)\"\n \
 	let bindir=\"$(BINDIR)\"\n \
+	let sbindir=\"$(SBINDIR)\"\n \
 	let sharedir=\"$(SHAREDIR)\"\n" \
 	> ocaml/fhs.ml
 

ocaml/xapi/OMakefile

@@ -280,8 +280,8 @@ OCamlProgram(at_least_once_more, at_least_once_more at_least_once_more_test)
 
 .PHONY: install
 install:
-	mkdir -p $(DESTDIR)$(OPTDIR)/bin
-	cp -f xapi $(DESTDIR)$(OPTDIR)/bin
+	mkdir -p $(DESTDIR)$(SBINDIR)
+	cp -f xapi $(DESTDIR)$(SBINDIR)
 	mkdir -p $(DESTDIR)$(OPTDIR)/debug
 	$(IPROG) quicktest $(DESTDIR)$(OPTDIR)/debug
 	cp -f quicktestbin $(DESTDIR)$(OPTDIR)/debug

ocaml/xenops/OMakefile

@@ -69,11 +69,12 @@ install:
 	mkdir -p $(DESTDIR)$(OPTDIR)/debug
 	cp -f $(DEBUG_PROGS) $(DESTDIR)$(OPTDIR)/debug
 	sh -c 'for i in $(SYMLINK_PROGS); do ln -nfs xenops $(DESTDIR)$(OPTDIR)/debug/$$i; done'
-	mkdir -p $(DESTDIR)$(OPTDIR)/bin
-	$(IPROG) $(BIN_PROGS) $(DESTDIR)$(OPTDIR)/bin
+	mkdir -p $(DESTDIR)$(BINDIR)
+	$(IPROG) $(BIN_PROGS) $(DESTDIR)$(BINDIR)
 	mkdir -p $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) fence $(DESTDIR)$(LIBEXECDIR)/fence.bin
-	$(IPROG) squeezed $(DESTDIR)$(LIBEXECDIR)/squeezed
+	mkdir -p $(DESTDIR)$(LIBEXECDIR)
+	$(IPROG) squeezed $(DESTDIR)$(LIBEXECDIR)
 
 .PHONY: sdk-install
 sdk-install: install

scripts/install.sh

@@ -55,6 +55,7 @@ for FILE in ${FILES}; do
         -e "s!@WEBDIR@!${WEBDIR}!g" \
         -e "s!@XHADIR@!${XHADIR}!g" \
         -e "s!@BINDIR@!${BINDIR}!g" \
+	-e "s!@SBINDIR@!${SBINDIR}!g" \
          ${NEWFILE}
   fi
 done