X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/c9731b9b3ee43c4c8d82c31009a5870a01d3acfa..25c93232ead88499dc1d1b5bf145e8fbfdb5bbe8:/Makefile

diff --git a/Makefile b/Makefile
index a509c0b..68feaf0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 all: mlton
 
 COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
-	openssl/openssl_sml.so
+	openssl/openssl_sml.so config.sml
+
+config.sml:
+	echo -e 'structure Config :> CONFIG = struct\nopen ConfigDefault\nend' > $@
 
 .PHONY: all mlton smlnj install
 
@@ -101,32 +104,38 @@ COMMON_MLTON_DEPS := openssl/mlton/FFI/libssl.h.mlb \
 	src/plugins/*.sig src/plugins/*.sml \
 	src/mail/*.sig src/mail/*.sml
 
+MLTON := mlton -link-opt -ldl
+
+ifdef DEBUG
+	MLTON += -const 'Exn.keepHistory true'
+endif
+
 bin/domtool-server: $(COMMON_MLTON_DEPS) src/domtool-server.mlb 
-	mlton -output bin/domtool-server -link-opt -ldl src/domtool-server.mlb
+	$(MLTON) -output bin/domtool-server src/domtool-server.mlb
 
 bin/domtool-client: $(COMMON_MLTON_DEPS) src/domtool-client.mlb
-	mlton -output bin/domtool-client -link-opt -ldl src/domtool-client.mlb
+	$(MLTON) -output bin/domtool-client src/domtool-client.mlb
 
 bin/domtool-slave: $(COMMON_MLTON_DEPS) src/domtool-slave.mlb
-	mlton -output bin/domtool-slave -link-opt -ldl src/domtool-slave.mlb
+	$(MLTON) -output bin/domtool-slave src/domtool-slave.mlb
 
 bin/domtool-admin: $(COMMON_MLTON_DEPS) src/domtool-admin.mlb
-	mlton -output bin/domtool-admin -link-opt -ldl src/domtool-admin.mlb
+	$(MLTON) -output bin/domtool-admin src/domtool-admin.mlb
 
 bin/domtool-doc: $(COMMON_MLTON_DEPS) src/domtool-doc.mlb
-	mlton -output bin/domtool-doc -link-opt -ldl src/domtool-doc.mlb
+	$(MLTON) -output bin/domtool-doc src/domtool-doc.mlb
 
 bin/dbtool: $(COMMON_MLTON_DEPS) src/dbtool.mlb
-	mlton -output bin/dbtool -link-opt -ldl src/dbtool.mlb
+	$(MLTON) -output bin/dbtool src/dbtool.mlb
 
 bin/vmail: $(COMMON_MLTON_DEPS) src/vmail.mlb
-	mlton -output bin/vmail -link-opt -ldl src/vmail.mlb
+	$(MLTON) -output bin/vmail src/vmail.mlb
 
 bin/setsa: $(COMMON_MLTON_DEPS) src/setsa.mlb
-	mlton -output bin/setsa -link-opt -ldl src/setsa.mlb
+	$(MLTON) -output bin/setsa src/setsa.mlb
 
 bin/smtplog: $(COMMON_MLTON_DEPS) src/smtplog.mlb
-	mlton -output bin/smtplog -link-opt -ldl src/smtplog.mlb
+	$(MLTON) -output bin/smtplog src/smtplog.mlb
 
 install:
 	cp scripts/domtool-publish /usr/local/sbin/
@@ -134,6 +143,7 @@ install:
 	cp scripts/domtool-reset-local /usr/local/sbin/
 	cp scripts/domtool-adduser /usr/local/bin/
 	cp scripts/domtool-addcert /usr/local/bin/
+	cp scripts/domtool-addcert-daemon /usr/local/bin/
 	cp scripts/domtool-addacl /usr/local/bin/
 	cp scripts/domtool-rmuser /usr/local/bin/
 	cp scripts/domtool-admin-sudo /usr/local/bin/
@@ -154,7 +164,17 @@ install:
 	cp src/plugins/domtool-postgres /usr/local/sbin/
 	cp src/plugins/domtool-mysql /usr/local/sbin/
 
-.PHONY: grab_lib
+.PHONY: grab_lib install_server install_slave
 
 grab_lib:
-	rsync --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
+	rsync -r --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
+
+install_server:
+	sudo /etc/init.d/domtool-server stop
+	sudo make install
+	sudo /etc/init.d/domtool-server start
+
+install_slave:
+	sudo /etc/init.d/domtool-slave stop
+	sudo make install
+	sudo /etc/init.d/domtool-slave start