--- js/src/Makefile.ref.orig	2006-07-26 21:16:47.000000000 +0200
+++ js/src/Makefile.ref	2007-11-19 20:11:45.382151545 +0100
@@ -63,7 +63,7 @@
 
 ifdef JS_THREADSAFE
 DEFINES += -DJS_THREADSAFE
-INCLUDES += -I$(DIST)/include/nspr
+INCLUDES += -I/usr/include/nspr
 ifdef USE_MSVC
 OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
 else
@@ -134,7 +134,7 @@
 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.
@@ -282,6 +282,7 @@
 PROGRAM = $(OBJDIR)/js
 ifdef JS_PERLCONNECT
 PROG_LIBS += $(PERLLDFLAGS)
+OTHER_LIBS += $(PERLLDFLAGS)
 endif
 endif
 
@@ -336,7 +337,7 @@
 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
 else
 $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
-	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
 	    $(PROG_LIBS)
 endif
 
--- js/src/liveconnect/Makefile.ref.orig	2003-11-15 01:11:05.000000000 +0100
+++ js/src/liveconnect/Makefile.ref	2007-11-19 22:33:08.645585176 +0100
@@ -103,10 +103,8 @@
 
 INCLUDES   += -I. -I.. -I../$(OBJDIR)
 
-ifdef USE_MSVC
-OTHER_LIBS += $(DEPTH)/fdlibm/$(OBJDIR)/fdlibm.lib
-else
-OTHER_LIBS += -L$(DEPTH)/fdlibm/$(OBJDIR) -lfdm -L../$(OBJDIR) -ljs
+ifndef USE_MSVC
+OTHER_LIBS += -L../$(OBJDIR) -ljs
 endif
 
 #
@@ -131,7 +129,7 @@
 
 ifdef JS_THREADSAFE
 DEFINES += -DJS_THREADSAFE
-INCLUDES += -I../../../dist/$(OBJDIR)/include
+INCLUDES += -I../../../dist/$(OBJDIR)/include -I/usr/include/nspr
 ifdef USE_MSVC
 OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
 else
@@ -165,5 +163,6 @@
 
 $(PROGRAM): $(OBJDIR)/$(PROG_FILE).o $(OBJDIR)/jsj_simpleapi.o
 	@$(MAKE_OBJDIR)
-	$(CC) -o $@ $(CFLAGS) $+ $(LIBRARY) ../$(OBJDIR)/libjs.a $(LDFLAGS) $(OTHER_LIBS)
+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $+ -L$(OBJDIR) -ljsj $(OTHER_LIBS) $(PROG_LIBS) -Wl,-rpath=$(JDK)/jre/lib/i386 -Wl,-rpath=$(JDK)/jre/lib/i386/native_threads -Wl,-rpath=$(JDK)/jre/lib/i386/classic -Wl,-rpath=$(JDK)/jre/lib/i386/client
 endif
+SONAME=libjsj.so.0
--- js/src/liveconnect/config/Linux_All.mk.orig	Tue Mar 19 05:28:53 2002
+++ js/src/liveconnect/config/Linux_All.mk	Sat May 18 18:51:49 2002
@@ -45,9 +45,10 @@
 # INCLUDES   += -I$(JDK)/include -I$(JDK)/include/solaris
 INCLUDES   += -I$(JDK)/include/linux -I$(JDK)/include
 
-OTHER_LIBS += -L$(JDK)/jre/lib/i386/native_threads
-OTHER_LIBS += -L$(JDK)/jre/lib/i386/classic
-OTHER_LIBS += -L$(JDK)/jre/lib/i386 -ljava -ljvm -lhpi
+PROG_LIBS += -L$(JDK)/jre/lib/i386/native_threads
+PROG_LIBS += -L$(JDK)/jre/lib/i386/classic
+PROG_LIBS += -L$(JDK)/jre/lib/i386/client
+PROG_LIBS += -L$(JDK)/jre/lib/i386 -ljava -ljvm -lhpi -lverify
 
 # To run lcshell with the above, built in a Mozilla tree with a local nspr:
 # LD_LIBRARY_PATH=../../../dist/lib:/share/builds/components/jdk/1.2.2/Linux/jre/lib/i386:/share/builds/components/jdk/1.2.2/Linux/jre/lib/i386/classic:/share/builds/components/jdk/1.2.2/Linux/jre/lib/i386/native_threads CLASSPATH=./classes/Linux_All_DBG.OBJ/js15lc30.jar lcshell
--- js/src/rules.mk.orig	2003-11-15 01:11:04.000000000 +0100
+++ js/src/rules.mk	2004-03-24 16:33:03.000000000 +0100
@@ -73,6 +73,9 @@
 	@$(MAKE_OBJDIR)
 	$(CC) -o $@ -c $(CFLAGS) $*.c
 
+$(LIB_OBJS): $(OBJDIR)/%.o: %.c
+	@$(MAKE_OBJDIR)
+	$(CC) -o $@ -fPIC -c $(CFLAGS) $*.c
 
 $(OBJDIR)/%.o: %.c
 	@$(MAKE_OBJDIR)
@@ -118,7 +118,7 @@
 	$(RANLIB) $@
 
 $(SHARED_LIBRARY): $(LIB_OBJS)
-	$(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
+	$(MKSHLIB) $(LDFLAGS) -o $@ $(LIB_OBJS) $(OTHER_LIBS) -lm
 endif
 endif