src/Makefile.ref        | 6 +++---

 src/config/Linux_All.mk | 4 ++--

 src/rules.mk            | 5 +++--

 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.ref b/src/Makefile.ref

index 587ab86..1c621b6 100644

--- a/src/Makefile.ref

+++ b/src/Makefile.ref

@@ -134,7 +134,7 @@ endif

 ifdef JS_READLINE

 # For those platforms with the readline library installed.

 DEFINES += -DEDITLINE

-PROG_LIBS += -lreadline -ltermcap

+PROG_LIBS += -lreadline

 else

 ifdef JS_EDITLINE

 # Use the editline library, built locally.

@@ -335,8 +335,8 @@ ifdef USE_MSVC

 $(PROGRAM): $(PROG_OBJS) $(LIBRARY)

 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^

 else

-$(PROGRAM): $(PROG_OBJS) $(LIBRARY)

-	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \

+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY)

+	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L $(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \

 	    $(PROG_LIBS)

 endif

diff --git a/src/config/Linux_All.mk b/src/config/Linux_All.mk

index 0c43df4..b66c0cc 100644

--- a/src/config/Linux_All.mk

+++ b/src/config/Linux_All.mk

@@ -90,11 +90,11 @@ endif

 # Use the editline library to provide line-editing support.

 JS_EDITLINE = 1

-ifeq ($(CPU_ARCH),x86_64)

+#ifeq ($(CPU_ARCH),x86_64)

 # Use VA_COPY() standard macro on x86-64

 # FIXME: better use it everywhere

 OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy

-endif

+#endif

 ifeq ($(CPU_ARCH),x86_64)

 # We need PIC code for shared libraries

diff --git a/src/rules.mk b/src/rules.mk

index 8d484db..48392f5 100644

--- a/src/rules.mk

+++ b/src/rules.mk

@@ -115,7 +115,8 @@ $(LIBRARY): $(LIB_OBJS)

 	$(RANLIB) $@

 $(SHARED_LIBRARY): $(LIB_OBJS)

-	$(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)

+	$(MKSHLIB) -o $(SHARED_LIBRARY).$(VERSION) $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)

+	ln -sf `basename $(SHARED_LIBRARY).$(VERSION)` $(SHARED_LIBRARY)

 endif

 endif

@@ -169,7 +170,7 @@ ifneq "$(strip $(JARS))" ""

 	$(CP) $(JARS) $(DIST)/$(LIBDIR)

 endif

 ifneq "$(strip $(SHARED_LIBRARY))" ""

-	$(CP) $(SHARED_LIBRARY) $(DIST)/$(LIBDIR)

+	$(CP) $(SHARED_LIBRARY).$(VERSION) $(DIST)/$(LIBDIR)

 endif

 ifneq "$(strip $(PROGRAM))" ""

 	$(CP) $(PROGRAM) $(DIST)/bin