Merge commit 'ctdb-ronnie/master'

[sahlberg/ctdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0002da5f1447733107ed7ed63792fa0b028bdafc..176e2bfc234d091ecd1d77bfe857ae5291625ad3 100755 (executable)
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,6 +12,7 @@ bindir = @bindir@
 sbindir = @sbindir@
 mandir = @mandir@
 localstatedir = @localstatedir@
+logdir = @LOGDIR@
 VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
 srcdir = @srcdir@
 etcdir = @sysconfdir@
@@ -30,6 +31,7 @@ IPQ_LIBS = @IPQ_LIBS@
 CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -I@tallocdir@ -I@tdbdir@/include -I@libreplacedir@ \
        -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
+       -DLOGDIR=\"$(logdir)\" \
        -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
 
 LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
@@ -74,6 +76,17 @@ showflags:
        @echo '  CFLAGS = $(CFLAGS)'
        @echo '  LIBS = $(LIBS)'
 
+showlayout::
+       @echo "ctdb will be installed into:"
+       @echo "  prefix:      $(prefix)"
+       @echo "  bindir:      $(bindir)"
+       @echo "  sbindir:     $(sbindir)"
+       @echo "  libdir:      $(libdir)"
+       @echo "  vardir:      $(localstatedir)"
+       @echo "  logdir:      $(logdir)"
+       @echo "  mandir:      $(mandir)"
+       @echo "  etcdir:      $(etcdir)"
+
 .c.o:
        @echo Compiling $*.c
        @mkdir -p `dirname $@`