Revision 780060cb Makefile.am

b/Makefile.am
40 40
BUILD_RPC = $(top_srcdir)/autotools/build-rpc
41 41
SHELL_ENV_INIT = autotools/shell-env-init
42 42

  
43
# starting as of Ganeti 2.10, all files are stored in a single directory,
43
# starting as of Ganeti 2.10, all files are stored in two directories,
44 44
# with only symbolic links added at other places.
45
versiondir = $(libdir)/ganeti-$(VERSION)
45
#
46
# $(versiondir) contains most of Ganeti and all architecture-dependent files
47
# $(versionedsharedir) contains only architecture-independent files; all python
48
# executables need to go directly to $(versionedsharedir), as all ganeti python
49
# mdules are installed outside the usual python path, i.e., as private modules.
50
#
51
# $(defaultversiondir) and $(defaultversionedsharedir) are the corresponding
52
# directories for "the currently running" version of Ganeti. We never install
53
# there, but all symbolic links go there, rather than directory to $(versiondir)
54
# or $(versionedsharedir). Note that all links to $(default*dir) need to be stable;
55
# so, if some currently architecture-independent executable is replaced by an
56
# architecture-dependent one (and hence has to go under $(versiondir)), add a link
57
# under $(versionedsharedir) but do not change the external links.
58
versiondir = $(libdir)/ganeti/$(VERSION)
59
versionedsharedir = $(prefix)/share/ganeti/$(VERSION)
46 60

  
47 61
# Note: these are automake-specific variables, and must be named after
48 62
# the directory + 'dir' suffix
......
50 64
myexeclibdir = $(pkglibdir)
51 65
bindir = $(versiondir)$(exec_prefix)/bin
52 66
sbindir = $(versiondir)$(exec_prefix)/sbin
53
mandir = $(versiondir)$(datarootdir)/man
54
pkgpythondir = $(versiondir)$(pythondir)/ganeti
67
mandir = $(versionedsharedir)$(datarootdir)/man
68
pkgpythondir = $(versionedsharedir)/ganeti
69
gntpythondir = $(versionedsharedir)
70
pkgpython_bindir = $(versionedsharedir)
71
gnt_python_sbindir = $(versionedsharedir)
72
tools_pythondir = $(versionedsharedir)
55 73

  
56 74
clientdir = $(pkgpythondir)/client
57 75
cmdlibdir = $(pkgpythondir)/cmdlib
......
213 231
	$(addsuffix /*.hi,$(HS_DIRS)) \
214 232
	$(addsuffix /*.o,$(HS_DIRS)) \
215 233
	$(PYTHON_BOOTSTRAP) \
234
	$(gnt_python_sbin_SCRIPTS) \
216 235
	epydoc.conf \
217 236
	$(REPLACE_VARS_SED) \
218 237
	$(SHELL_ENV_INIT) \
......
237 256
	stamp-directories \
238 257
	stamp-srclinks \
239 258
	$(nodist_pkgpython_PYTHON) \
259
	$(gnt_scripts) \
240 260
	$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
241 261
	$(HS_BUILT_TEST_HELPERS) \
242 262
	src/ganeti-confd \
......
295 315
nodist_pkgpython_PYTHON = \
296 316
	$(BUILT_PYTHON_SOURCES)
297 317

  
318
nodist_pkgpython_bin_SCRIPTS = \
319
	$(nodist_pkglib_python_scripts)
320

  
321
pkgpython_bin_SCRIPTS = \
322
	$(pkglib_python_scripts)
323

  
298 324
noinst_PYTHON = \
299 325
	lib/build/__init__.py \
300 326
	lib/build/shell_example_lexer.py \
......
867 893
	scripts/gnt-os \
868 894
	scripts/gnt-storage
869 895

  
896
gnt_scripts_basenames = \
897
	$(patsubst scripts/%,%,$(gnt_scripts))
898

  
899
gnt_python_sbin_SCRIPTS = \
900
	$(PYTHON_BOOTSTRAP_SBIN)
901

  
902
gntpython_SCRIPTS = $(gnt_scripts)
903

  
870 904
PYTHON_BOOTSTRAP_SBIN = \
871 905
	daemons/ganeti-masterd \
872 906
	daemons/ganeti-noded \
873 907
	daemons/ganeti-rapi \
874
	daemons/ganeti-watcher \
875
	$(gnt_scripts)
908
	daemons/ganeti-watcher
876 909

  
877 910
PYTHON_BOOTSTRAP = \
878
	$(PYTHON_BOOTSTRAP_SBIN) \
879 911
	tools/burnin \
880 912
	tools/ensure-dirs \
881 913
	tools/node-cleanup \
......
983 1015
	tools/ganeti-listrunner
984 1016

  
985 1017
nodist_sbin_SCRIPTS = \
986
	$(PYTHON_BOOTSTRAP_SBIN) \
987 1018
	daemons/ganeti-cleaner
988 1019

  
989 1020
# strip path prefixes off the sbin scripts
......
1025 1056
	tools/master-ip-setup \
1026 1057
	tools/xen-console-wrapper
1027 1058

  
1028
nodist_tools_python_scripts = \
1059
nodist_tools_python_SCRIPTS = \
1029 1060
	tools/node-cleanup
1030 1061

  
1031 1062
nodist_tools_SCRIPTS = \
1032
	$(nodist_tools_python_scripts) \
1033 1063
	tools/users-setup \
1034 1064
	tools/vcluster-setup
1035 1065

  
......
1047 1077
	tools/kvm-ifup \
1048 1078
	tools/vif-ganeti \
1049 1079
	tools/net-common \
1050
	$(pkglib_python_scripts) \
1051 1080
	$(HS_MYEXECLIB_PROGS)
1052 1081

  
1053
nodist_myexeclib_SCRIPTS = \
1054
	$(nodist_pkglib_python_scripts)
1055

  
1056 1082
# strip path prefixes off the lib python scripts
1057 1083
all_myexeclib_scripts = \
1058 1084
	$(patsubst tools/%,%,$(patsubst daemons/%,%,\
......
1525 1551
	$(CHECK_IMPORTS) \
1526 1552
	$(CHECK_HEADER) \
1527 1553
	$(DOCPP) \
1554
	$(gnt_python_sbin_SCRIPTS) \
1528 1555
	$(PYTHON_BOOTSTRAP)
1529 1556

  
1530 1557
standalone_python_modules = \
......
1541 1568
	$(CHECK_HEADER) \
1542 1569
	$(DOCPP) \
1543 1570
	$(PYTHON_BOOTSTRAP) \
1571
	$(gnt_python_sbin_SCRIPTS) \
1544 1572
	qa \
1545 1573
	$(python_test_support)
1546 1574

  
......
1963 1991
tools/node-cleanup: MODULE = ganeti.tools.node_cleanup
1964 1992
$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst test/hs/%,%,$@)
1965 1993

  
1966
$(PYTHON_BOOTSTRAP): Makefile | stamp-directories
1994
$(PYTHON_BOOTSTRAP) $(gnt_scripts) $(gnt_python_sbin_SCRIPTS): Makefile | stamp-directories
1967 1995
	test -n "$(MODULE)" || { echo Missing module; exit 1; }
1968 1996
	set -e; \
1969 1997
	{ echo '#!/usr/bin/python'; \

Also available in: Unified diff