HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disentangle vmail from the mail node, Prepare for dovecot support
[hcoop/domtool2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e23ac72
..
7b85747
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-32,7
+32,7
@@
config.sml:
mlton: bin/domtool-server bin/domtool-client bin/domtool-slave \
bin/domtool-admin bin/domtool-doc bin/dbtool bin/vmail \
bin/smtplog bin/setsa bin/mysql-fixperms bin/webbw bin/domtool-tail \
mlton: bin/domtool-server bin/domtool-client bin/domtool-slave \
bin/domtool-admin bin/domtool-doc bin/dbtool bin/vmail \
bin/smtplog bin/setsa bin/mysql-fixperms bin/webbw bin/domtool-tail \
- bin/fwtool
+ bin/fwtool
bin/domtool-config
smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm pcre/smlnj/FFI/libpcre.h.cm \
src/domtool.cm
smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm pcre/smlnj/FFI/libpcre.h.cm \
src/domtool.cm
@@
-121,6
+121,10
@@
src/fwtool.mlb: src/prefix.mlb src/sources src/suffix.mlb
$(MAKE_MLB_BASE) >src/fwtool.mlb
echo "main-fwtool.sml" >>src/fwtool.mlb
$(MAKE_MLB_BASE) >src/fwtool.mlb
echo "main-fwtool.sml" >>src/fwtool.mlb
+src/domtool-config.mlb: src/prefix.mlb src/sources src/suffix.mlb
+ $(MAKE_MLB_BASE) >src/domtool-config.mlb
+ echo "main-config.sml" >>src/domtool-config.mlb
+
openssl/smlnj/FFI/libssl.h.cm: openssl/openssl_sml.h
cd openssl/smlnj ; ml-nlffigen -d FFI -lh LibsslH.libh -include ../libssl-h.sml \
-cm libssl.h.cm -D__builtin_va_list="void*" \
openssl/smlnj/FFI/libssl.h.cm: openssl/openssl_sml.h
cd openssl/smlnj ; ml-nlffigen -d FFI -lh LibsslH.libh -include ../libssl-h.sml \
-cm libssl.h.cm -D__builtin_va_list="void*" \
@@
-208,6
+212,9
@@
bin/webbw: $(COMMON_MLTON_DEPS) src/stats/webbw.mlb src/stats/*.sml
bin/domtool-tail: $(COMMON_MLTON_DEPS) src/tail/tail.mlb src/tail/*.sml
mlton -output bin/domtool-tail src/tail/tail.mlb
bin/domtool-tail: $(COMMON_MLTON_DEPS) src/tail/tail.mlb src/tail/*.sml
mlton -output bin/domtool-tail src/tail/tail.mlb
+bin/domtool-config: $(COMMON_MLTON_DEPS) src/domtool-config.mlb src/main-config.sml
+ $(MLTON) -output bin/domtool-config src/domtool-config.mlb
+
elisp/domtool-tables.el: lib/*.dtl bin/domtool-doc
bin/domtool-doc -basis -emacs >$@
elisp/domtool-tables.el: lib/*.dtl bin/domtool-doc
bin/domtool-doc -basis -emacs >$@
@@
-244,6
+251,7
@@
install: install_sos
-cp bin/webbw /usr/local/sbin/
-cp bin/domtool-tail /usr/local/bin/
-chmod +s /usr/local/bin/domtool-tail
-cp bin/webbw /usr/local/sbin/
-cp bin/domtool-tail /usr/local/bin/
-chmod +s /usr/local/bin/domtool-tail
+ cp bin/domtool-config /usr/local/bin/
cp src/plugins/domtool-postgres /usr/local/sbin/
cp src/plugins/domtool-mysql /usr/local/sbin/
-mkdir -p $(EMACS_DIR)
cp src/plugins/domtool-postgres /usr/local/sbin/
cp src/plugins/domtool-mysql /usr/local/sbin/
-mkdir -p $(EMACS_DIR)
@@
-254,12
+262,19
@@
install: install_sos
grab_lib:
rsync -r --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
grab_lib:
rsync -r --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
+install_serverslave:
+ /etc/init.d/domtool-server stop
+ /etc/init.d/domtool-slave stop
+ make install
+ /etc/init.d/domtool-server start
+ /etc/init.d/domtool-slave start
+
install_server:
install_server:
-
sudo
/etc/init.d/domtool-server stop
-
sudo
make install
-
sudo
/etc/init.d/domtool-server start
+ /etc/init.d/domtool-server stop
+ make install
+ /etc/init.d/domtool-server start
install_slave:
install_slave:
-
sudo
/etc/init.d/domtool-slave stop
-
sudo
make install
-
sudo
/etc/init.d/domtool-slave start
+ /etc/init.d/domtool-slave stop
+ make install
+ /etc/init.d/domtool-slave start