Revision 6051fd94

b/.gitignore
24 24
/autotools/missing
25 25
/autotools/py-compile
26 26
/autotools/replace_vars.sed
27
/autotools/shell-env-init
27 28
/config.log
28 29
/config.status
29 30
/configure
b/Makefile.am
35 35
REPLACE_VARS_SED = autotools/replace_vars.sed
36 36
CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
37 37
BUILD_RPC = $(top_srcdir)/autotools/build-rpc
38
SHELL_ENV_INIT = autotools/shell-env-init
38 39

  
39 40
# Note: these are automake-specific variables, and must be named after
40 41
# the directory + 'dir' suffix
......
148 149
	$(PYTHON_BOOTSTRAP) \
149 150
	epydoc.conf \
150 151
	autotools/replace_vars.sed \
152
	$(SHELL_ENV_INIT) \
151 153
	daemons/daemon-util \
152 154
	daemons/ganeti-cleaner \
153 155
	devel/upload \
......
535 537
endif
536 538
install-exec-hook:
537 539
	@mkdir_p@ "$(DESTDIR)$(XEN_CONFIG_DIR)/scripts"
538
	$(LN_S) -f "$(DESTDIR)${myexeclibdir}/vif-ganeti" \
540
	$(LN_S) -f "$(DESTDIR)$(myexeclibdir)/vif-ganeti" \
539 541
		"$(DESTDIR)$(XEN_CONFIG_DIR)/scripts/vif-ganeti"
540 542
if WANT_HTOOLS
541 543
	@mkdir_p@ $(DESTDIR)$(iallocatorsdir)
......
1146 1148
	  echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
1147 1149
	  echo "ES_SEARCH_PATH = [$(ES_SEARCH_PATH)]"; \
1148 1150
	  echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
1151
	  echo "XEN_CONFIG_DIR = '$(XEN_CONFIG_DIR)'"; \
1149 1152
	  echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
1150 1153
	  echo "XEN_INITRD = '$(XEN_INITRD)'"; \
1151 1154
	  echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
......
1213 1216
lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC)
1214 1217
	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@
1215 1218

  
1216
$(REPLACE_VARS_SED): Makefile
1219
$(SHELL_ENV_INIT): Makefile
1220
	set -e; \
1221
	{ echo '# Allow overriding for tests'; \
1222
	 echo 'readonly LOCALSTATEDIR=$${LOCALSTATEDIR:-$${GANETI_ROOTDIR:-}$(localstatedir)}'; \
1223
	 echo 'readonly SYSCONFDIR=$${SYSCONFDIR:-$${GANETI_ROOTDIR:-}$(sysconfdir)}'; \
1224
	 echo; \
1225
	 echo 'readonly PKGLIBDIR=$(pkglibdir)'; \
1226
	 echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \
1227
	 echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \
1228
	 echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \
1229
	 echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
1230
	} > $@
1231

  
1232
$(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile
1217 1233
	set -e; \
1218 1234
	{ echo 's#@PREFIX@#$(prefix)#g'; \
1219 1235
	  echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
......
1239 1255
	  echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
1240 1256
	  echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
1241 1257
	  echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
1258
	  echo 's#@''XEN_CONFIG_DIR@#$(XEN_CONFIG_DIR)#g'; \
1259
	  echo; \
1260
	  echo '/^@SHELL_ENV_INIT@$$/ {'; \
1261
	  echo '  r $(SHELL_ENV_INIT)'; \
1262
	  echo '  d'; \
1263
	  echo '}'; \
1242 1264
	} > $@
1243 1265

  
1244 1266
# Using deferred evaluation
b/configure.ac
49 49
  [ssh_config_dir="/etc/ssh"])
50 50
AC_SUBST(SSH_CONFIG_DIR, $ssh_config_dir)
51 51

  
52
# --with-xen-config-dir=...
53
AC_ARG_WITH([xen-config-dir],
54
  [AS_HELP_STRING([--with-xen-config-dir=DIR],
55
                  m4_normalize([Xen configuration directory
56
                                (default: /etc/xen)]))],
57
  [xen_config_dir="$withval"],
58
  [xen_config_dir=/etc/xen])
59
AC_SUBST(XEN_CONFIG_DIR, $xen_config_dir)
60

  
52 61
# --with-os-search-path=...
53 62
# do a bit of black sed magic to for quoting of the strings in the list
54 63
AC_ARG_WITH([os-search-path],

Also available in: Unified diff