Revision 9f8e85c6 Makefile.am

b/Makefile.am
1799 1799 
	  echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \
1800 1800 
	  echo "SOCAT_USE_COMPRESS = $(SOCAT_USE_COMPRESS)"; \
1801 1801 
	  echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
1802 
	  echo "TOOLSDIR = '$(toolsdir)'"; \
1802 
	  echo "TOOLSDIR = '$(libdir)/ganeti/tools'"; \
1803 1803 
	  echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
1804 1804 
	  echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \
1805 
	  echo "PKGLIBDIR = '$(pkglibdir)'"; \
1805 
	  echo "PKGLIBDIR = '$(libdir)/ganeti'"; \
1806 1806 
	  echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
1807 1807 
	  echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \
1808 1808 
	  echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \
......
1873 1873 
	    -DSOCAT_USE_ESCAPE="$(SOCAT_USE_ESCAPE)" \
1874 1874 
	    -DSOCAT_USE_COMPRESS="$(SOCAT_USE_COMPRESS)" \
1875 1875 
	    -DLVM_STRIPECOUNT="$(LVM_STRIPECOUNT)" \
1876 
	    -DTOOLSDIR="$(toolsdir)" \
1876 
	    -DTOOLSDIR="$(libdir)/ganeti/tools)" \
1877 1877 
	    -DGNT_SCRIPTS="$(foreach i,$(notdir $(gnt_scripts)),\"$(i)\":)" \
1878 1878 
	    -DHS_HTOOLS_PROGS="$(foreach i,$(HS_HTOOLS_PROGS),\"$(i)\":)" \
1879 
	    -DPKGLIBDIR="$(pkglibdir)" \
1879 
	    -DPKGLIBDIR="$(libdir)/ganeti" \
1880 1880 
	    -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \
1881 1881 
	    -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \
1882 1882 
	    -DSYSLOG_USAGE="$(SYSLOG_USAGE)" \
......
1944 1944 
	  echo 'readonly LOCALSTATEDIR=$${LOCALSTATEDIR:-$${GANETI_ROOTDIR:-}$(localstatedir)}'; \
1945 1945 
	  echo 'readonly SYSCONFDIR=$${SYSCONFDIR:-$${GANETI_ROOTDIR:-}$(sysconfdir)}'; \
1946 1946 
	  echo; \
1947 
	  echo 'readonly PKGLIBDIR=$(pkglibdir)'; \
1947 
	  echo 'readonly PKGLIBDIR=$(libdir)/ganeti'; \
1948 1948 
	  echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \
1949 1949 
	  echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \
1950 1950 
	  echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \

Also available in: Unified diff