Skip to content
Browse files

Switch the OMakefiles to using the new FHS variables

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
  • Loading branch information...
1 parent 4ae1883 commit 34d0ef000f3a27823e4ded356b32fc366a837673 @jonludlam jonludlam committed Nov 30, 2011
View
11 OMakefile
@@ -41,6 +41,9 @@ LDFLAGS+=-static
if $(not $(defined-env XEN_ROOT))
XEN_ROOT =
export
+if $(not $(defined-env DESTDIR))
+ DESTDIR =
+ export
XEN_CFLAGS=-I$(XEN_ROOT)/usr/include
XEN_OCAML_LINK_FLAGS=-cclib -L$(XEN_ROOT)/usr/$(LIBDIR)
@@ -49,14 +52,6 @@ XEN_OCAML_CLIBS=
# For the Zurich chroot environment
CFLAGS+=-I$(shell ocamlc -where)
-DESTDIR=$(getenv DESTDIR, $(ROOT)/dist/staging)
-RAW_BASE_PATH=$(shell scripts/base-path scripts/xapi.conf)
-BASE_PATH=$(DESTDIR)$(RAW_BASE_PATH)
-BIN_DIR=$(RAW_BASE_PATH)/bin
-BIN_PATH=$(DESTDIR)$(BIN_DIR)
-DEBUGDIST=$(BASE_PATH)/debug
-LIBEXEC=$(BASE_PATH)/libexec
-
DIST=$(ROOT)/dist
SDK=$(DESTDIR)/usr/share/doc/xapi
SDKWWW=$(DESTDIR)/usr/share/doc/xapi/www
View
4 java/OMakefile
@@ -8,6 +8,6 @@ clean:
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)/www
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug/www
# If we haven't built it then we can't install it (see COMPILE_JAVA)
- $(IDATA) XenServerConsole.jar $(DEBUGDIST)/www || /bin/true
+ $(IDATA) XenServerConsole.jar $(DESTDIR)$(OPTDIR)/debug/www || /bin/true
View
12 javascript/OMakefile
@@ -1,10 +1,10 @@
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)/www
- cp *.js *.html *.css $(DEBUGDIST)/www
- mkdir -p $(DEBUGDIST)/www/jquery
- cp -v jquery/* $(DEBUGDIST)/www/jquery
- mkdir -p $(DEBUGDIST)/www/images
- cp -v images/xen_logo.gif $(DEBUGDIST)/www/images
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug/www
+ cp *.js *.html *.css $(DESTDIR)$(OPTDIR)/debug/www
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug/www/jquery
+ cp -v jquery/* $(DESTDIR)$(OPTDIR)/debug/www/jquery
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug/www/images
+ cp -v images/xen_logo.gif $(DESTDIR)$(OPTDIR)/debug/www/images
View
2 ocaml/auth/OMakefile
@@ -17,4 +17,4 @@ clean:
.PHONY: install
install:
- mkdir -p $(BIN_PATH)
+ mkdir -p $(DESTDIR)$(OPTDIR)/bin
View
4 ocaml/autogen/OMakefile
@@ -20,5 +20,5 @@ api_docs: custom_actions_doc
.PHONY: install
install:
- mkdir -p $(BASE_PATH)/debug
- $(IPROG) rbac_static.csv $(BASE_PATH)/debug
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) rbac_static.csv $(DESTDIR)$(OPTDIR)/debug
View
4 ocaml/cdrommon/OMakefile
@@ -6,8 +6,8 @@ OCamlProgram(cdrommon, cdrommon)
.PHONY: install
install:
- mkdir -p $(LIBEXEC)
- cp -f cdrommon $(LIBEXEC)
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ cp -f cdrommon $(DESTDIR)$(LIBEXECDIR)
.PHONY: clean
clean:
View
4 ocaml/database/OMakefile
@@ -33,8 +33,8 @@ section:
.PHONY: install
install:
- mkdir -p $(LIBEXEC)
- $(IPROG) block_device_io $(LIBEXEC)
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) block_device_io $(DESTDIR)$(LIBEXECDIR)
.PHONY: sdk-install
sdk-install: install
View
4 ocaml/db_process/OMakefile
@@ -7,8 +7,8 @@ OCamlProgram(xapi-db-process, xapi_db_process)
.PHONY: install
install:
- mkdir -p $(BIN_PATH)
- cp -f xapi-db-process $(BIN_PATH)
+ mkdir -p $(DESTDIR)$(OPTDIR)/bin
+ cp -f xapi-db-process $(DESTDIR)$(OPTDIR)/bin
.PHONY: sdk-install
sdk-install: install
View
4 ocaml/events/OMakefile
@@ -10,7 +10,7 @@ clean:
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- $(IPROG) event_listen $(DEBUGDIST)
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) event_listen $(DESTDIR)$(OPTDIR)/debug
View
4 ocaml/graph/OMakefile
@@ -10,7 +10,7 @@ clean:
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- $(IPROG) graph $(DEBUGDIST)
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) graph $(DESTDIR)$(OPTDIR)/debug
View
2 ocaml/idl/OMakefile
@@ -100,7 +100,7 @@ sdk-install: doc sdk-README.txt
META: META.in
sed 's/@VERSION@/$(PRODUCT_VERSION)/g' < $< > $@
-if $(defined DESTDIR)
+if $(defined-env DESTDIR)
INSTALL_PATH = $(DESTDIR)/$(shell ocamlfind printconf destdir)
export
else
View
4 ocaml/idl/js_backend/OMakefile
@@ -29,5 +29,5 @@ js_binding: main
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)/www
- cp api.js $(DEBUGDIST)/www
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug/www
+ cp api.js $(DESTDIR)$(OPTDIR)/debug/www
View
2 ocaml/idl/ocaml_backend/OMakefile
@@ -152,7 +152,7 @@ clean:
META: META.in
sed 's/@VERSION@/$(PRODUCT_VERSION)/g' < $< > $@
-if $(defined DESTDIR)
+if $(defined-env DESTDIR)
INSTALL_PATH = $(DESTDIR)/$(shell ocamlfind printconf destdir)
export
else
View
8 ocaml/license/OMakefile
@@ -22,10 +22,10 @@ OCamlProgram(v6d-reopen-logs, v6d_reopen_logs)
.PHONY: install
install: $(V6D)
- mkdir -p $(LIBEXEC)
- $(IPROG) $(V6D) $(LIBEXEC)
- mkdir -p $(BIN_PATH)
- $(IPROG) v6d-reopen-logs $(BIN_PATH)
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) $(V6D) $(DESTDIR)$(LIBEXECDIR)
+ mkdir -p $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) v6d-reopen-logs $(DESTDIR)$(OPTDIR)/bin
.PHONY: clean
clean:
View
10 ocaml/lvhdrt/OMakefile
@@ -11,9 +11,9 @@ clean:
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- $(IPROG) lvhdrt $(DEBUGDIST)
- mkdir -p $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) lvhdrt-helper $(DESTDIR)/etc/xapi.d/plugins/lvhdrt-helper
- $(IPROG) lvhdrt-trash-vdi $(DESTDIR)/etc/xapi.d/plugins/lvhdrt-trash-vdi
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) lvhdrt $(DESTDIR)$(OPTDIR)/debug
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) lvhdrt-helper $(DESTDIR)$(PLUGINDIR)/lvhdrt-helper
+ $(IPROG) lvhdrt-trash-vdi $(DESTDIR)$(PLUGINDIR)/lvhdrt-trash-vdi
View
4 ocaml/mpathalert/OMakefile
@@ -12,6 +12,6 @@ clean:
.PHONY: install
install:
- mkdir -p $(BIN_PATH)
- $(IPROG) mpathalert $(BIN_PATH)
+ mkdir -p $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) mpathalert $(DESTDIR)$(OPTDIR)/bin
View
8 ocaml/multipathrt/OMakefile
@@ -15,7 +15,7 @@ clean:
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- $(IPROG) multipathrt $(DEBUGDIST)
- mkdir -p $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) multipathrt-helper $(DESTDIR)/etc/xapi.d/plugins/multipathrt-helper
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) multipathrt $(DESTDIR)$(OPTDIR)/debug
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) multipathrt-helper $(DESTDIR)$(PLUGINDIR)/multipathrt-helper
View
4 ocaml/perftest/OMakefile
@@ -20,6 +20,6 @@ clean:
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- $(IPROG) perftest $(DEBUGDIST)
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) perftest $(DESTDIR)$(OPTDIR)/debug
View
4 ocaml/ptoken/OMakefile
@@ -11,8 +11,8 @@ clean:
.PHONY: install
install:
- mkdir -p $(LIBEXEC)
- $(IPROG) genptoken $(LIBEXEC)
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) genptoken $(DESTDIR)$(LIBEXECDIR)
mkdir -p $(DIST)/genptoken-src
$(IDATA) $(GENSECRET_SRC_FILES) $(DIST)/genptoken-src
View
4 ocaml/sm-cli/OMakefile
@@ -23,6 +23,6 @@ clean:
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- $(IPROG) sm $(DEBUGDIST)
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) sm $(DESTDIR)$(OPTDIR)/debug
View
4 ocaml/toplevel/OMakefile
@@ -1,11 +1,11 @@
-OCAML_LIBS = ../idl/ocaml_backend/common ../idl/ocaml_backend/client $(BASE_PATH)/lib/ocaml/toplevellib
+OCAML_LIBS = ../idl/ocaml_backend/common ../idl/ocaml_backend/client $(DESTDIR)$(OPTDIR)/lib/ocaml/toplevellib
OCAMLINCLUDES = ../idl/ocaml_backend/
OCAMLPACKS = xml-light2 stdext uuid
COMPILE_NATIVE=no
section
OCAMLFLAGS+=-linkall
- OCamlProgram(xencaml-bin, toplevelhelper $(BASE_PATH)/lib/ocaml/topstart )
+ OCamlProgram(xencaml-bin, toplevelhelper $(DESTDIR)$(OPTDIR)/lib/ocaml/topstart )
.PHONY: clean
View
4 ocaml/vncproxy/OMakefile
@@ -6,8 +6,8 @@ OCamlProgram(vncproxy, vncproxy)
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- $(IPROG) vncproxy $(DEBUGDIST)
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) vncproxy $(DESTDIR)$(OPTDIR)/debug
.PHONY: sdk-install
sdk-install: install
View
26 ocaml/xapi/OMakefile
@@ -283,25 +283,25 @@ OCamlProgram(at_least_once_more, at_least_once_more at_least_once_more_test)
generate_constants: config_constants.ml
config_constants.ml: config_constants.ml.in
- sed "s!@BASE_PATH@!\"$(RAW_BASE_PATH)\"!" $< > $@
+ sed "s!@BASE_PATH@!\"$(OPTDIR)\"!" $< > $@
.PHONY: install
install:
- mkdir -p $(BIN_PATH)
- cp -f xapi $(BIN_PATH)
- mkdir -p $(DEBUGDIST)
- $(IPROG) quicktest $(DEBUGDIST)
- cp -f quicktestbin $(DEBUGDIST)
- $(IPROG) rrddump $(DEBUGDIST)
- mkdir -p $(LIBEXEC)
- $(IPROG) sparse_dd $(LIBEXEC)
- mkdir -p $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) monitor_fake_plugin $(DESTDIR)/etc/xapi.d/plugins
+ mkdir -p $(DESTDIR)$(OPTDIR)/bin
+ cp -f xapi $(DESTDIR)$(OPTDIR)/bin
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) quicktest $(DESTDIR)$(OPTDIR)/debug
+ cp -f quicktestbin $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) rrddump $(DESTDIR)$(OPTDIR)/debug
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) sparse_dd $(DESTDIR)$(LIBEXECDIR)
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) monitor_fake_plugin $(DESTDIR)$(PLUGINDIR)
.PHONY: sdk-install
sdk-install: install
- mkdir -p $(LIBEXEC)
- cp fakeguestagent $(LIBEXEC)/
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ cp fakeguestagent $(DESTDIR)$(LIBEXECDIR)/
.PHONY: clean
clean:
View
7 ocaml/xe-cli/OMakefile
@@ -99,13 +99,12 @@ clean:
.PHONY: install
install:
- mkdir -p $(BIN_PATH)
- $(IPROG) xe $(BIN_PATH)
+ mkdir -p $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xe $(DESTDIR)$(OPTDIR)/bin
mkdir -p $(DESTDIR)/usr/bin
- ln -sf $(BIN_DIR)/xe $(DESTDIR)/usr/bin/xe
+ ln -sf $(OPTDIR)/bin/xe $(DESTDIR)/usr/bin/xe
mkdir -p $(DESTDIR)/etc/bash_completion.d
$(IPROG) bash-completion $(DESTDIR)/etc/bash_completion.d/xe
- mkdir -p $(DEBUGDIST)
.PHONY: sdk-install
sdk-install: install
View
4 ocaml/xe-cli/rt/OMakefile
@@ -30,5 +30,5 @@ install:
mkdir -p /tmp/cli-rt-domu/root
cp gtmessages.ml gtcomms.ml gtlinuxops.ml gtserver_linux.ml /tmp/cli-rt-domu/root
(cd $(ROOT)/scripts; /bin/sh ./make-patch /tmp/cli-rt-domu /tmp/cli-rt-domu-shar.sh)
- mv /tmp/cli-rt-domu-shar.sh $(BASE_PATH)/debug
- $(IPROG) install-debian-pv.sh install-debian-pv-inside.sh $(BASE_PATH)/debug
+ mv /tmp/cli-rt-domu-shar.sh $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) install-debian-pv.sh install-debian-pv-inside.sh $(DESTDIR)$(OPTDIR)/debug
View
4 ocaml/xe-cli/rt/geneva/OMakefile
@@ -14,8 +14,8 @@ clean:
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- $(IPROG) cli_test sm_stress myfirstpatch.asc $(DEBUGDIST)
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) cli_test sm_stress myfirstpatch.asc $(DESTDIR)$(OPTDIR)/debug
.PHONY: install
install:
View
4 ocaml/xenguest/OMakefile
@@ -21,8 +21,8 @@ clean:
.PHONY: install
install:
- mkdir -p $(LIBEXEC)
- $(IPROG) xenguest dumpcore $(LIBEXEC)
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) xenguest dumpcore $(DESTDIR)$(LIBEXECDIR)
mkdir -p $(DIST)/xenguest-src
$(IDATA) $(XENGUEST_SRC_FILES) $(DIST)/xenguest-src
View
16 ocaml/xenops/OMakefile
@@ -66,14 +66,14 @@ allxenops: $(DEBUG_PROGS) $(BIN_PROGS) $(OTHER_PROGS)
.PHONY: install
install:
- mkdir -p $(DEBUGDIST)
- cp -f $(DEBUG_PROGS) $(DEBUGDIST)
- sh -c 'for i in $(SYMLINK_PROGS); do ln -nfs xenops $(DEBUGDIST)/$$i; done'
- mkdir -p $(BIN_PATH)
- $(IPROG) $(BIN_PROGS) $(BIN_PATH)
- mkdir -p $(LIBEXEC)
- $(IPROG) fence $(LIBEXEC)/fence.bin
- $(IPROG) squeezed $(LIBEXEC)/squeezed
+ 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)$(LIBEXECDIR)
+ $(IPROG) fence $(DESTDIR)$(LIBEXECDIR)/fence.bin
+ $(IPROG) squeezed $(DESTDIR)$(LIBEXECDIR)/squeezed
.PHONY: sdk-install
sdk-install: install
View
16 ocaml/xiu/OMakefile
@@ -17,14 +17,14 @@ clean:
.PHONY: install
install:
- mkdir -p $(LIBEXEC)
- $(IPROG) xiu $(LIBEXEC)/
- mkdir -p $(BASE_PATH)/lib
- $(IDATA) libxenctrl_xiu.so $(BASE_PATH)/lib
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) xiu $(DESTDIR)$(LIBEXECDIR)/
+ mkdir -p $(DESTDIR)$(OPTDIR)/lib
+ $(IDATA) libxenctrl_xiu.so $(DESTDIR)$(OPTDIR)/lib
.PHONY: sdk-install
sdk-install:
- mkdir -p $(LIBEXEC)
- $(IPROG) xiu $(LIBEXEC)/
- mkdir -p $(BASE_PATH)/lib
- $(IDATA) libxenctrl_xiu.so $(BASE_PATH)/lib
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) xiu $(DESTDIR)$(LIBEXECDIR)/
+ mkdir -p $(DESTDIR)$(OPTDIR)/lib
+ $(IDATA) libxenctrl_xiu.so $(DESTDIR)$(OPTDIR)/lib
View
4 ocaml/xsh/OMakefile
@@ -10,8 +10,8 @@ section
.PHONY: install
install:
- mkdir -p $(BIN_PATH)
- cp -f xsh $(BIN_PATH)
+ mkdir -p $(DESTDIR)$(OPTDIR)/bin
+ cp -f xsh $(DESTDIR)$(OPTDIR)/bin
clean:
rm -f *.cmi *.cmx *.cmo *.a *.cma *.cmxa *.run *.opt *.annot *.o xsh
View
160 scripts/OMakefile
@@ -2,35 +2,35 @@
.PHONY: install
install:
- mkdir -p $(BIN_PATH)
- mkdir -p $(DESTDIR)/var/patch
- mkdir -p $(DESTDIR)/var/patch/applied
- mkdir -p $(DESTDIR)/var/xapi
- mkdir -p $(DESTDIR)/etc/xapi.d
- mkdir -p $(DESTDIR)/etc/xensource
+ mkdir -p $(DESTDIR)$(OPTDIR)/bin
+ mkdir -p $(DESTDIR)$(VARPATCHDIR)
+ mkdir -p $(DESTDIR)$(VARPATCHDIR)/applied
+ mkdir -p $(DESTDIR)$(VARDIR)
+ mkdir -p $(DESTDIR)$(HOOKSDIR)
+ mkdir -p $(DESTDIR)$(ETCDIR)
mkdir -p $(DESTDIR)/etc/logrotate.d
- mkdir -p $(DESTDIR)/etc/xensource/master.d
- mkdir -p $(LIBEXEC)
+ mkdir -p $(DESTDIR)$(ETCDIR)/master.d
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
$(IPROG) base-path $(DESTDIR)/etc/xapi.d
- $(IPROG) sm_diagnostics $(LIBEXEC)
- $(IPROG) thread_diagnostics $(LIBEXEC)
- mkdir -p $(DESTDIR)/etc/xensource/bugtool/xapi
- $(IDATA) bugtool-plugin/xapi.xml $(DESTDIR)/etc/xensource/bugtool
- $(IDATA) bugtool-plugin/xapi/stuff.xml $(DESTDIR)/etc/xensource/bugtool/xapi
- $(IPROG) fence $(LIBEXEC)
- $(IPROG) xha-lc $(LIBEXEC)
- $(IPROG) xapi-health-check $(LIBEXEC)
- $(IPROG) license-check.py $(LIBEXEC)
- $(IPROG) mail-alarm $(LIBEXEC)
+ $(IPROG) sm_diagnostics $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) thread_diagnostics $(DESTDIR)$(LIBEXECDIR)
+ mkdir -p $(DESTDIR)$(ETCDIR)/bugtool/xapi
+ $(IDATA) bugtool-plugin/xapi.xml $(DESTDIR)$(ETCDIR)/bugtool
+ $(IDATA) bugtool-plugin/xapi/stuff.xml $(DESTDIR)$(ETCDIR)/bugtool/xapi
+ $(IPROG) fence $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) xha-lc $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) xapi-health-check $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) license-check.py $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) mail-alarm $(DESTDIR)$(LIBEXECDIR)
$(IPROG) audit-logrotate $(DESTDIR)/etc/logrotate.d/audit
$(IPROG) xapi-logrotate $(DESTDIR)/etc/logrotate.d/xapi
- $(IPROG) xapi-wait-init-complete $(BIN_PATH)
- $(IPROG) xapi-autostart-vms $(BIN_PATH)
- $(IPROG) udhcpd.skel $(DESTDIR)/var/xapi/udhcpd.skel
- $(IPROG) xapi.conf $(DESTDIR)/etc/xapi.conf
- $(IPROG) log.conf $(DESTDIR)/etc/xensource/log.conf
- $(IPROG) db.conf.skel $(DESTDIR)/etc/xensource/db.conf
- $(IPROG) rio.db.conf.skel $(DESTDIR)/etc/xensource/db.conf.rio
+ $(IPROG) xapi-wait-init-complete $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xapi-autostart-vms $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) udhcpd.skel $(DESTDIR)/var/xapi/udhcpd.skel #### FHS_FIXME
+ $(IPROG) xapi.conf $(DESTDIR)$(XAPICONF)
+ $(IPROG) log.conf $(DESTDIR)$(ETCDIR)/log.conf
+ $(IPROG) db.conf.skel $(DESTDIR)$(ETCDIR)/db.conf
+ $(IPROG) rio.db.conf.skel $(DESTDIR)$(ETCDIR)/db.conf.rio
mkdir -p $(DESTDIR)/etc/init.d
mkdir -p $(DESTDIR)/etc/rc.d/init.d
$(IPROG) init.d-xenservices $(DESTDIR)/etc/rc.d/init.d/xenservices
@@ -43,72 +43,72 @@ install:
$(IDATA) squeezed-logrotate $(DESTDIR)/etc/logrotate.d/squeezed
$(IPROG) init.d-v6d $(DESTDIR)/etc/rc.d/init.d/v6d
$(IDATA) v6d-logrotate $(DESTDIR)/etc/logrotate.d/v6d
- mkdir -p $(DESTDIR)/etc/xensource/master.d
- $(IPROG) on-master-start $(DESTDIR)/etc/xensource/master.d/01-example
- $(IPROG) mpathalert-daemon $(DESTDIR)/etc/xensource/master.d/03-mpathalert-daemon
+ mkdir -p $(DESTDIR)$(ETCDIR)/master.d
+ $(IPROG) on-master-start $(DESTDIR)$(ETCDIR)/master.d/01-example
+ $(IPROG) mpathalert-daemon $(DESTDIR)$(ETCDIR)/master.d/03-mpathalert-daemon
mkdir -p $(DESTDIR)/etc/sysconfig
$(IPROG) sysconfig-xapi $(DESTDIR)/etc/sysconfig/xapi
- mkdir -p $(DESTDIR)/etc/udev
- $(IPROG) xen-backend.rules $(DESTDIR)/etc/udev
- $(IPROG) xen-frontend.rules $(DESTDIR)/etc/udev
- $(IPROG) generate_ssl_cert $(LIBEXEC)
- $(IPROG) fix_firewall.sh $(BIN_PATH)
- mkdir -p $(BASE_PATH)/debug
- $(IPROG) debug_ha_query_liveset $(BASE_PATH)/debug
- $(IPROG) xe-scsi-dev-map $(BIN_PATH)
- $(IPROG) xe-mount-iso-sr $(BIN_PATH)
- $(IPROG) xe-reset-networking $(BIN_PATH)
- $(IPROG) xe-set-iscsi-iqn $(BIN_PATH)
- $(IPROG) xe-toolstack-restart $(BIN_PATH)
- $(IPROG) xe-xentrace $(BIN_PATH)
- $(IPROG) xe-edit-bootloader $(BIN_PATH)
- $(IPROG) static-vdis $(BIN_PATH)
- $(IPROG) with-vdi $(BASE_PATH)/debug
- mkdir -p $(DESTDIR)/etc/udev/rules.d
+ mkdir -p $(DESTDIR)/etc/udev ### FHS_FIXME
+ $(IPROG) xen-backend.rules $(DESTDIR)/etc/udev ### FHS_FIXME
+ $(IPROG) xen-frontend.rules $(DESTDIR)/etc/udev ### FHS_FIXME
+ $(IPROG) generate_ssl_cert $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) fix_firewall.sh $(DESTDIR)$(OPTDIR)/bin
+ mkdir -p $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) debug_ha_query_liveset $(DESTDIR)$(OPTDIR)/debug
+ $(IPROG) xe-scsi-dev-map $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xe-mount-iso-sr $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xe-reset-networking $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xe-set-iscsi-iqn $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xe-toolstack-restart $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xe-xentrace $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xe-edit-bootloader $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) static-vdis $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) with-vdi $(DESTDIR)$(OPTDIR)/debug
+ mkdir -p $(DESTDIR)/etc/udev/rules.d ### FHS_FIXME
sh -c \
'cd $(DESTDIR)/etc/udev/rules.d; \
ln -sf ../xen-backend.rules; \
ln -sf ../xen-frontend.rules'
- mkdir -p $(DESTDIR)/etc/xensource/scripts
- $(IPROG) block-frontend vif tap block $(DESTDIR)/etc/xensource/scripts
- $(IPROG) pool.conf $(DESTDIR)/etc/xensource
+ mkdir -p $(DESTDIR)$(SCRIPTSDIR)
+ $(IPROG) block-frontend vif tap block $(DESTDIR)$(SCRIPTSDIR)
+ $(IPROG) pool.conf $(DESTDIR)$(ETCDIR)
mkdir -p $(DESTDIR)/etc/pam.d
$(IPROG) pam.d-xapi $(DESTDIR)/etc/pam.d/xapi
- $(IPROG) qemu-dm-wrapper vncterm-wrapper upload-wrapper logs-download $(LIBEXEC)
- mkdir -p $(BASE_PATH)/packages/iso #omg XXX
- $(IPROG) interface-reconfigure $(LIBEXEC)
- $(IPROG) InterfaceReconfigure.py $(LIBEXEC)
- $(IPROG) InterfaceReconfigureBridge.py $(LIBEXEC)
- $(IPROG) InterfaceReconfigureVswitch.py $(LIBEXEC)
- $(IPROG) rewrite-management-interface $(LIBEXEC)
- $(IPROG) interface-visualise $(LIBEXEC)
- $(IPROG) logrotate.sh $(LIBEXEC)
- $(IPROG) xapi-rolling-upgrade-miami $(LIBEXEC)/xapi-rolling-upgrade
- $(IPROG) set-hostname $(LIBEXEC)
- $(IPROG) update-mh-info $(LIBEXEC)
- $(IPROG) host-bugreport-upload $(LIBEXEC)/host-bugreport-upload
- $(IPROG) xe-backup-metadata $(BIN_PATH)
- $(IPROG) xe-restore-metadata $(BIN_PATH)
- $(IPROG) link-vms-by-sr.py $(LIBEXEC)
- $(IPROG) print-custom-templates $(LIBEXEC)
- $(IPROG) backup-sr-metadata.py $(LIBEXEC)
- $(IPROG) restore-sr-metadata.py $(LIBEXEC)
- $(IPROG) probe-device-for-file $(LIBEXEC)
- $(IPROG) backup-metadata-cron $(LIBEXEC)
- $(IPROG) lw-force-domain-leave $(LIBEXEC)
+ $(IPROG) qemu-dm-wrapper vncterm-wrapper upload-wrapper logs-download $(DESTDIR)$(LIBEXECDIR)
+ mkdir -p $(DESTDIR)$(OPTDIR)/packages/iso #omg XXX
+ $(IPROG) interface-reconfigure $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) InterfaceReconfigure.py $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) InterfaceReconfigureBridge.py $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) InterfaceReconfigureVswitch.py $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) rewrite-management-interface $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) interface-visualise $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) logrotate.sh $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) xapi-rolling-upgrade-miami $(DESTDIR)$(LIBEXECDIR)/xapi-rolling-upgrade
+ $(IPROG) set-hostname $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) update-mh-info $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) host-bugreport-upload $(DESTDIR)$(LIBEXECDIR)/host-bugreport-upload
+ $(IPROG) xe-backup-metadata $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) xe-restore-metadata $(DESTDIR)$(OPTDIR)/bin
+ $(IPROG) link-vms-by-sr.py $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) print-custom-templates $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) backup-sr-metadata.py $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) restore-sr-metadata.py $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) probe-device-for-file $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) backup-metadata-cron $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) lw-force-domain-leave $(DESTDIR)$(LIBEXECDIR)
$(IPROG) init.d-perfmon $(DESTDIR)/etc/rc.d/init.d/perfmon
mkdir -p $(DESTDIR)/etc/sysconfig
$(IPROG) sysconfig-perfmon $(DESTDIR)/etc/sysconfig/perfmon
- $(IPROG) perfmon $(BIN_PATH)
- mkdir -p $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) plugins/perfmon $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) plugins/extauth-hook $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) plugins/extauth-hook-AD.py $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) plugins/iovirt $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) set-dom0-memory-target-from-packs $(LIBEXEC)
- mkdir -p $(DESTDIR)/etc/xapi.d/host-post-declare-dead
- $(IPROG) 10resetvdis $(DESTDIR)/etc/xapi.d/host-post-declare-dead
- $(IPROG) pci-info $(LIBEXEC)
+ $(IPROG) perfmon $(DESTDIR)$(OPTDIR)/bin
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) plugins/perfmon $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) plugins/extauth-hook $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) plugins/extauth-hook-AD.py $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) plugins/iovirt $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) set-dom0-memory-target-from-packs $(DESTDIR)$(LIBEXECDIR)
+ mkdir -p $(DESTDIR)$(HOOKSDIR)/host-post-declare-dead
+ $(IPROG) 10resetvdis $(DESTDIR)$(HOOKSDIR)/host-post-declare-dead
+ $(IPROG) pci-info $(DESTDIR)$(LIBEXECDIR)
.PHONY: sdk-install
sdk-install: install
View
12 scripts/examples/python/OMakefile
@@ -37,14 +37,14 @@ README : index.html
lynx -dump index.html > README
.PHONY: install
install:
- mkdir -p $(LIBEXEC)
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
mkdir -p $(DESTDIR)/usr/lib/$(PYTHON_DIR)/site-packages
- mkdir -p $(DESTDIR)/etc/xapi.d/plugins
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
$(IDATA) XenAPIPlugin.py XenAPI.py inventory.py $(DESTDIR)/usr/lib/$(PYTHON_DIR)/site-packages/
- $(IEXE) echo.py $(DESTDIR)/etc/xapi.d/plugins/echo
- $(IEXE) wake-on-lan.py $(DESTDIR)/etc/xapi.d/plugins/wake-on-lan
- $(IEXE) shutdown.py $(LIBEXEC)/shutdown
- $(IEXE) shell.py $(LIBEXEC)/shell.py
+ $(IEXE) echo.py $(DESTDIR)$(PLUGINDIR)/echo
+ $(IEXE) wake-on-lan.py $(DESTDIR)$(PLUGINDIR)/wake-on-lan
+ $(IEXE) shutdown.py $(DESTDIR)$(LIBEXECDIR)/shutdown
+ $(IEXE) shell.py $(DESTDIR)$(LIBEXECDIR)/shell.py
.PHONY: sdk-install
sdk-install:
View
4 scripts/host-backup-restore/OMakefile
@@ -1,7 +1,7 @@
.PHONY: install
install:
- mkdir -p $(LIBEXEC)
- $(IPROG) host-backup host-restore $(LIBEXEC)
+ mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ $(IPROG) host-backup host-restore $(DESTDIR)$(LIBEXECDIR)
.PHONY: sdk-install
sdk-install: install
View
12 scripts/poweron/OMakefile
@@ -1,8 +1,8 @@
.PHONY: install
install:
- mkdir -p $(DESTDIR)/etc/xapi.d/plugins
- $(IPROG) wlan.py $(DESTDIR)/etc/xapi.d/plugins/wlan.py
- $(IPROG) iLOPowerON.xml $(DESTDIR)/etc/xapi.d/plugins/iLOPowerON.xml
- $(IPROG) iLO.py $(DESTDIR)/etc/xapi.d/plugins/iLO.py
- $(IPROG) DRAC.py $(DESTDIR)/etc/xapi.d/plugins/DRAC.py
- $(IPROG) power-on.py $(DESTDIR)/etc/xapi.d/plugins/power-on-host
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
+ $(IPROG) wlan.py $(DESTDIR)$(PLUGINDIR)/wlan.py
+ $(IPROG) iLOPowerON.xml $(DESTDIR)$(PLUGINDIR)/iLOPowerON.xml
+ $(IPROG) iLO.py $(DESTDIR)$(PLUGINDIR)/iLO.py
+ $(IPROG) DRAC.py $(DESTDIR)$(PLUGINDIR)/DRAC.py
+ $(IPROG) power-on.py $(DESTDIR)$(PLUGINDIR)/power-on-host
View
6 scripts/templates/OMakefile
@@ -1,7 +1,7 @@
.PHONY: install
install:
- mkdir -p $(BASE_PATH)/packages/post-install-scripts
- $(IPROG) debug $(BASE_PATH)/packages/post-install-scripts
- $(IPROG) debian $(BASE_PATH)/packages/post-install-scripts/debian-etch
+ mkdir -p $(DESTDIR)$(OPTDIR)/packages/post-install-scripts
+ $(IPROG) debug $(DESTDIR)$(OPTDIR)/packages/post-install-scripts
+ $(IPROG) debian $(DESTDIR)$(OPTDIR)/packages/post-install-scripts/debian-etch
# ln -f $(BASE_PATH)/packages/post-install-scripts/debian-etch
# $(BASE_PATH)/packages/post-install-scripts/debian-sarge

0 comments on commit 34d0ef0

Please sign in to comment.
Something went wrong with that request. Please try again.