Revision ae6a0a7c

b/Makefile.am
65 65
versionedsharedir = $(prefix)/share/ganeti/$(DIRVERSION)
66 66
defaultversionedsharedir = $(prefix)/share/ganeti/default
67 67

  
68

  
69 68
# Note: these are automake-specific variables, and must be named after
70 69
# the directory + 'dir' suffix
71 70
pkglibdir = $(versiondir)$(libdir)/ganeti
72 71
myexeclibdir = $(pkglibdir)
73
bindir = $(versiondir)$(exec_prefix)/bin
74
sbindir = $(versiondir)$(exec_prefix)/sbin
75
mandir = $(versionedsharedir)$(datarootdir)/man
72
bindir = $(versiondir)/$(BINDIR)
73
sbindir = $(versiondir)$(SBINDIR)
74
mandir = $(versionedsharedir)/root$(MANDIR)
76 75
pkgpythondir = $(versionedsharedir)/ganeti
77 76
gntpythondir = $(versionedsharedir)
78 77
pkgpython_bindir = $(versionedsharedir)
......
101 100
	$(libdir)/ganeti/iallocators \
102 101
	$(libdir)/ganeti/tools \
103 102
	$(prefix)/share/ganeti \
104
	$(exec_prefix)/bin \
105
	$(exec_prefix)/sbin \
106
	$(datarootdir)/man/man1 \
107
	$(datarootdir)/man/man7 \
108
	$(datarootdir)/man/man8
103
	$(BINDIR) \
104
	$(SBINDIR) \
105
	$(MANDIR)/man1 \
106
	$(MANDIR)/man7 \
107
	$(MANDIR)/man8
109 108

  
110 109
# Delete output file if an error occurred while building it
111 110
.DELETE_ON_ERROR:
......
1876 1875
	{ echo 's#@''PREFIX@#$(prefix)#g'; \
1877 1876
	  echo 's#@''SYSCONFDIR@#$(sysconfdir)#g'; \
1878 1877
	  echo 's#@''LOCALSTATEDIR@#$(localstatedir)#g'; \
1879
	  echo 's#@''BINDIR@#$(execprefix)/bin#g'; \
1880
	  echo 's#@''SBINDIR@#$(execprefix)/sbin#g'; \
1878
	  echo 's#@''BINDIR@#$(BINDIR)#g'; \
1879
	  echo 's#@''SBINDIR@#$(SBINDIR)#g'; \
1881 1880
	  echo 's#@''LIBDIR@#$(libdir)#g'; \
1882 1881
	  echo 's#@''GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
1883 1882
	  echo 's#@''CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
......
2212 2211
	$(LN_S) -f $(sysconfdir)/ganeti/lib $(DESTDIR)$(defaultversiondir)
2213 2212
	$(LN_S) -f $(sysconfdir)/ganeti/share $(DESTDIR)$(defaultversionedsharedir)
2214 2213
	for prog in $(HS_BIN_ROLES); do \
2215
	  $(LN_S) -f $(defaultversiondir)$(exec_prefix)/bin/$$prog $(DESTDIR)$(exec_prefix)/bin/$$prog; \
2214
	  $(LN_S) -f $(defaultversiondir)$(BINDIR)/$$prog $(DESTDIR)$(BINDIR)/$$prog; \
2216 2215
	done
2217 2216
	$(LN_S) -f $(defaultversiondir)$(libdir)/ganeti/iallocators/hail $(DESTDIR)$(libdir)/ganeti/iallocators/hail
2218 2217
	for prog in $(all_sbin_scripts); do \
2219
	  $(LN_S) -f $(defaultversiondir)$(exec_prefix)/sbin/$$prog $(DESTDIR)$(exec_prefix)/sbin/$$prog; \
2218
	  $(LN_S) -f $(defaultversiondir)$(SBINDIR)/$$prog $(DESTDIR)$(SBINDIR)/$$prog; \
2220 2219
	done
2221 2220
	for prog in $(gnt_scripts_basenames); do \
2222
	  $(LN_S) -f $(defaultversionedsharedir)/$$prog $(DESTDIR)$(exec_prefix)/sbin/$$prog; \
2221
	  $(LN_S) -f $(defaultversionedsharedir)/$$prog $(DESTDIR)$(SBINDIR)/$$prog; \
2223 2222
	done
2224 2223
	for prog in $(pkglib_python_basenames); do \
2225 2224
	  $(LN_S) -f $(defaultversionedsharedir)/$$prog $(DESTDIR)$(libdir)/ganeti/$$prog; \
......
2232 2231
	done
2233 2232
	if ! test -n '$(ENABLE_MANPAGES)'; then \
2234 2233
	  for man in $(manfullpath); do \
2235
	    $(LN_S) -f $(defaultversionedsharedir)$(datarootdir)/man/$$man $(DESTDIR)$(datarootdir)/man/$$man; \
2234
	    $(LN_S) -f $(defaultversionedsharedir)/root$(MANDIR)/$$man $(DESTDIR)$(MANDIR)/$$man; \
2236 2235
	  done; \
2237 2236
	fi
2238 2237
	for prog in $(myexeclib_scripts_basenames); do \
b/configure.ac
20 20
AC_SUBST([VERSION_SUFFIX], gnt_version_suffix)
21 21
AC_SUBST([VERSION_FULL], gnt_version_full)
22 22

  
23
AC_SUBST([BINDIR], $bindir)
24
AC_SUBST([SBINDIR], $sbindir)
25
AC_SUBST([MANDIR], $mandir)
26

  
23 27
# --enable-versionfull
24 28
AC_ARG_ENABLE([versionfull],
25 29
  [AS_HELP_STRING([--enable-versionfull],

Also available in: Unified diff