From d22be370fc5d99a820768a7a1b452085d43eafea Mon Sep 17 00:00:00 2001 From: Clinton Ebadi Date: Tue, 25 Feb 2014 05:21:36 -0500 Subject: [PATCH] Member directory: use portal config, build on 64-bit systems --- static/Makefile | 4 ++-- static/gen.sh | 2 +- static/gen.sml | 2 +- static/sources.cm | 7 +++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/static/Makefile b/static/Makefile index 73c276e..05b4c0f 100644 --- a/static/Makefile +++ b/static/Makefile @@ -1,4 +1,4 @@ -SMLBIN=/usr/local/sml/bin +include ../Makefile.common all: - $(SMLBIN)/ml-build sources.cm Gen.main gen + LD_LIBRARY_PATH=/afs/hcoop.net/user/h/hc/hcoop/portal-tools/lib32 ml-build sources.cm Gen.main gen diff --git a/static/gen.sh b/static/gen.sh index 416d1b7..c80ae44 100755 --- a/static/gen.sh +++ b/static/gen.sh @@ -1 +1 @@ -/usr/local/sml/bin/sml @SMLload=/home/hcoop/portal/static/gen.x86-linux \ No newline at end of file +LD_LIBRARY_PATH=/afs/hcoop.net/user/h/hc/hcoop/portal-tools/lib32 /usr/bin/sml @SMLload=/home/hcoop/portal3/static/gen.x86-linux diff --git a/static/gen.sml b/static/gen.sml index 2059f92..6fc65b2 100644 --- a/static/gen.sml +++ b/static/gen.sml @@ -14,7 +14,7 @@ val outputDir = "/home/hcoop/public_html/" fun generate () = let - val db = C.conn "dbname='hcoop_hcoop' host='postgres'" + val db = C.conn Config.dbstring fun procOutput (outf, cmdline) = let diff --git a/static/sources.cm b/static/sources.cm index 132faac..5cd97a9 100644 --- a/static/sources.cm +++ b/static/sources.cm @@ -1,8 +1,11 @@ Group is $/basis.cm $/smlnj-lib.cm - /usr/local/share/smlsql/libpq/sources.cm - /usr/local/share/mlt/src/lib/sources.cm + /afs/hcoop.net/user/h/hc/hcoop/portal-tools/src/smlsql/libpq/sources.cm + /afs/hcoop.net/user/h/hc/hcoop/portal-tools/src/mlt/src/lib/sources.cm + + ../config.sig + ../config.sml gen.sig gen.sml -- 2.20.1