Can now do substitutions inside others.

diff --git a/build.mk.in b/build.mk.in
index ab0cf3752e2b9cf5fa9b123ebb7a64ed7cf14841..7db103d4cf5bd59dc229196b8e46c91c9207e372 100644 (file)
--- a/build.mk.in
+++ b/build.mk.in
@@ -13,7 +13,7 @@ BUILDID @shell@ (hg id || echo "unknown") | sed -e "s/+ /-/;s/ /-/" @shellend@
 .SUFFIXES: .so
 
 .o.so:
-       ld -shared -Bdynamic -o $@ @srcs@ $(LDFLAGS)
+       @-ldline-@ $(LDFLAGS)
 
 CC=gcc
 CFLAGS+=-Wall -g -finline-functions -funroll-loops -std=c99 -I./ -DBUILDID=$(BUILDID)

diff --git a/lua/Makefile.in b/lua/Makefile.in
index 31c6508ee905bf979ae1de7361c4712c7e87d4b0..a272e5be56985a198ced463c163bf7c748af0720 100644 (file)
--- a/lua/Makefile.in
+++ b/lua/Makefile.in
@@ -1,12 +1,13 @@
 @include@ @includel@../build.mk@includel@
 
 CFLAGS+=$(INCLUA) $(INCPGSQL)
-LDFLAGS+=$(LIBLUA) $(LIBPGSQL)
+LDFLAGS+=$(LIBLUA) $(LIBPGSQL) $(STATICLUA)
 
 .PHONY: all
 all: lua.so nterfacer_lua.so
 
 lua.so: lua.o luacommands.o luacontrol.o luabot.o lualocal.o luadebug.o luadb.o luasocket.o luacrypto.o
-       @-ldline-@ $(STATICLUA)
+       @-ldline-@ $(LDFLAGS)
 
 nterfacer_lua.so: nterfacer_lua.o
+       @-ldline-@