# HG changeset patch
# User Adam Chlipala <adamc@hcoop.net>
# Date 1262293933 18000
# Node ID c9137606733a9544cf87e81f7be29724d19d4f99
# Parent  a5c160636832694acb479e762185175e1953df5a
Change location of dynamic libraries

diff -r a5c160636832 -r c9137606733a Makefile.in
--- a/Makefile.in	Thu Dec 31 15:14:24 2009 -0500
+++ b/Makefile.in	Thu Dec 31 16:12:13 2009 -0500
@@ -84,18 +84,18 @@
 	cp lib/ur/*.ur $(LIB_UR)/
 	mkdir -p $(LIB_C)
 	cp lib/c/*.o $(LIB_C)/
-	cp lib/c/*.so.$(LD_MAJOR).$(LD_MINOR) $(LIB_C)/
+	cp lib/c/*.so.$(LD_MAJOR).$(LD_MINOR) $(LIB)/..
 	mkdir -p $(LIB_JS)
 	cp lib/js/*.js $(LIB_JS)/
 	mkdir -p $(INCLUDE)
 	cp include/*.h $(INCLUDE)/
 	mkdir -p $(SITELISP)
 	cp src/elisp/*.el $(SITELISP)/
-	ldconfig $(LIB_C)
-	ln -sf $(LIB_C)/liburweb.so.$(LD_MAJOR) $(LIB_C)/liburweb.so
-	ln -sf $(LIB_C)/liburweb_http.so.$(LD_MAJOR) $(LIB_C)/liburweb_http.so
-	ln -sf $(LIB_C)/liburweb_cgi.so.$(LD_MAJOR) $(LIB_C)/liburweb_cgi.so
-	ln -sf $(LIB_C)/liburweb_fastcgi.so.$(LD_MAJOR) $(LIB_C)/liburweb_fastcgi.so
+	ln -sf liburweb.so.$(LD_MAJOR) $(LIB)/../liburweb.so
+	ln -sf liburweb_http.so.$(LD_MAJOR) $(LIB)/../liburweb_http.so
+	ln -sf liburweb_cgi.so.$(LD_MAJOR) $(LIB)/../liburweb_cgi.so
+	ln -sf /liburweb_fastcgi.so.$(LD_MAJOR) $(LIB)/../liburweb_fastcgi.so
+	ldconfig
 
 package:
 	hg archive -t tgz -X tests /tmp/urweb.tgz
diff -r a5c160636832 -r c9137606733a src/compiler.sml
--- a/src/compiler.sml	Thu Dec 31 15:14:24 2009 -0500
+++ b/src/compiler.sml	Thu Dec 31 16:12:13 2009 -0500
@@ -1031,7 +1031,7 @@
                       clibFile "request.o" ^ " " ^ clibFile "queue.o" ^ " " ^ clibFile "urweb.o"
                       ^ " " ^ clibFile "memmem.o" ^ " " ^ clibFile "mhash.o" ^ " " ^ #linkStatic proto
                   else
-                      "-L" ^ Config.libC ^ " -lurweb " ^ #linkDynamic proto
+                      "-L" ^ Config.lib ^ "/.. -lurweb " ^ #linkDynamic proto
 
         val compile = "gcc " ^ Config.gccArgs ^ " -Wimplicit -Werror -O3 -fno-inline -I " ^ Config.includ
                       ^ " " ^ #compile proto