Revision 6e3bf290 Makefile.am

b/Makefile.am
31 31
REPLACE_VARS_SED = autotools/replace_vars.sed
32 32
CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
33 33
BUILD_RPC = $(top_srcdir)/autotools/build-rpc
34
SHELL_ENV_INIT = autotools/shell-env-init
34 35

  
35 36
# Note: these are automake-specific variables, and must be named after
36 37
# the directory + 'dir' suffix
......
150 151
	$(PYTHON_BOOTSTRAP) \
151 152
	epydoc.conf \
152 153
	$(REPLACE_VARS_SED) \
154
	$(SHELL_ENV_INIT) \
153 155
	daemons/daemon-util \
154 156
	daemons/ganeti-cleaner \
155 157
	devel/upload \
......
1271 1273
lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC)
1272 1274
	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@
1273 1275

  
1274
$(REPLACE_VARS_SED): Makefile stamp-directories
1276
$(SHELL_ENV_INIT): Makefile stamp-directories
1277
	set -e; \
1278
	{ echo '# Allow overriding for tests'; \
1279
	  echo 'readonly LOCALSTATEDIR=$${LOCALSTATEDIR:-$${GANETI_ROOTDIR:-}$(localstatedir)}'; \
1280
	  echo 'readonly SYSCONFDIR=$${SYSCONFDIR:-$${GANETI_ROOTDIR:-}$(sysconfdir)}'; \
1281
	  echo; \
1282
	  echo 'readonly PKGLIBDIR=$(pkglibdir)'; \
1283
	  echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \
1284
	  echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \
1285
	  echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \
1286
	  echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
1287
	} > $@
1288

  
1289
$(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
1275 1290
	set -e; \
1276 1291
	{ echo 's#@PREFIX@#$(prefix)#g'; \
1277 1292
	  echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
......
1299 1314
	  echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
1300 1315
	  echo 's#@MODULES@#$(strip $(lint_python_code))#g'; \
1301 1316
	  echo 's#@ENABLE_SPLIT_QUERY@#$(ENABLE_SPLIT_QUERY)#g'; \
1317
	  echo; \
1318
	  echo '/^@SHELL_ENV_INIT@$$/ {'; \
1319
	  echo '  r $(SHELL_ENV_INIT)'; \
1320
	  echo '  d'; \
1321
	  echo '}'; \
1302 1322
	} > $@
1303 1323

  
1304 1324
# Using deferred evaluation

Also available in: Unified diff