cap-notify: implement cap-notify for sasl service (closes #84)

[solanum.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3104bf4d780abf9b37be7841b451007ea75818de..b03ba34ec448d0881165ea750145004ec851604f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,10 +24,17 @@ prefix              = @prefix@
 exec_prefix    = @exec_prefix@
 bindir         = @bindir@
 mandir         = @mandir@
+libdir          = @libdir@
+pkglibdir       = @pkglibdir@
 moduledir      = @moduledir@
 helpdir                = @helpdir@
-confdir                = @confdir@
+sysconfdir     = @sysconfdir@
 logdir         = @logdir@
+rundir         = @rundir@
+pkgrundir      = @pkgrundir@
+localstatedir  = @localstatedir@
+pkglocalstatedir= @pkglocalstatedir@
+PACKAGE_TARNAME        = @PACKAGE_TARNAME@
 
 # Default CFLAGS
 # CFLAGS = -g -O2 -DNDEBUG
@@ -46,12 +53,11 @@ CFLAGS              = @CFLAGS@
 # the system one.
 #CFLAGS= -DNDEBUG -g -O2 -D"FD_SETSIZE=1024"
 SHELL=/bin/sh
-SUBDIRS=libratbox modules extensions libcharybdis src tools servlink doc help
+# `extensions' must be after `modules' for proper creation of $(moduledir).
+SUBDIRS=libratbox modules extensions src tools ssld bandb doc help
 CLEANDIRS = ${SUBDIRS}
 RSA_FILES=rsa_respond/README rsa_respond/respond.c rsa_respond/Makefile
 
-MAKE = make ${MFLAGS} 
-
 all:   build
 
 
@@ -66,8 +72,11 @@ build:
                echo "Doing so now."; \
                sh configure; \
        fi
-       @if [ -d .hg ] ; then \
-               revh=`hg parents --template '#date|shortdate#_#node|short#' 2>/dev/null | sed -e s/-//g -e s/_/-/`;\
+       @if [ -d .git ] ; then \
+               revh=`git log -1 --date=short --pretty=format:%cd_%h 2>/dev/null | sed -e s/-//g -e s/_/-/`;\
+               [ -z "$$revh" ] || echo '#define SERNO "'$$revh'"' >include/serno.h ; \
+       elif [ -d .hg ] ; then \
+               revh=`hg parents --template '{date|shortdate}_{node|short}' 2>/dev/null | sed -e s/-//g -e s/_/-/`;\
                [ -z "$$revh" ] || echo '#define SERNO "'$$revh'"' >include/serno.h ; \
        fi
        @[ -f include/serno.h ] || echo '#define SERNO "unknown"' >include/serno.h
@@ -116,27 +125,27 @@ lint:
 install-mkdirs:
        @echo "ircd: setting up ircd directory structure"
        -@if test ! -d $(DESTDIR)$(prefix); then \
-               mkdir $(DESTDIR)$(prefix); \
+               mkdir -p -m 755 $(DESTDIR)$(prefix); \
        fi
        -@if test ! -d $(DESTDIR)$(bindir); then \
-               mkdir $(DESTDIR)$(bindir); \
+               mkdir -p -m 755 $(DESTDIR)$(bindir); \
        fi
-       -@if test ! -d $(DESTDIR)$(confdir); then \
-               mkdir $(DESTDIR)$(confdir); \
+       -@if test ! -d $(DESTDIR)$(sysconfdir); then \
+               mkdir -p -m 755 $(DESTDIR)$(sysconfdir); \
        fi
        -@if test ! -d $(DESTDIR)$(mandir); then \
-               mkdir $(DESTDIR)$(mandir); \
+               mkdir -p -m 755 $(DESTDIR)$(mandir); \
        fi
-       -@if test ! -d $(DESTDIR)$(moduledir); then \
-               mkdir $(DESTDIR)$(moduledir); \
+       -@if test ! -d $(DESTDIR)$(logdir); then \
+               mkdir -p -m 755 $(DESTDIR)$(logdir); \
        fi
-       -@if test ! -d $(DESTDIR)$(helpdir); then \
-               mkdir $(DESTDIR)$(helpdir); \
+       -@if test ! -d '$(DESTDIR)$(pkgrundir)'; then \
+               mkdir -p -m 755 '$(DESTDIR)$(pkgrundir)'; \
        fi
-       -@if test ! -d $(DESTDIR)$(logdir); then \
-               mkdir $(DESTDIR)$(logdir); \
+       -@if test ! -d '$(DESTDIR)$(pkglocalstatedir)'; then \
+               mkdir -p -m 755 '$(DESTDIR)$(pkglocalstatedir)'; \
        fi
-       
+
 install: install-mkdirs all
        @for i in $(SUBDIRS); do \
                echo "install ==> $$i";\