File js-1.7.0-Makefile.patch of Package js
diff -ruN js-orig/src/Makefile.ref js/src/Makefile.ref --- js-orig/src/Makefile.ref 2006-07-26 21:16:47.000000000 +0200 +++ js/src/Makefile.ref 2011-04-24 00:54:56.000000000 +0200 @@ -63,11 +63,11 @@ ifdef JS_THREADSAFE DEFINES += -DJS_THREADSAFE -INCLUDES += -I$(DIST)/include/nspr +INCLUDES += $(shell nspr-config --cflags) ifdef USE_MSVC OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib else -OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX) +OTHER_LIBS += $(shell nspr-config --libs) endif endif @@ -115,7 +115,7 @@ PERLLDFLAGS := $(subst -rdynamic,-export-dynamic,$(PERLLDFLAGS)) CFLAGS += $(PERLCFLAGS) -#LDFLAGS += $(PERLLDFLAGS) #PH removed this assgnment +LDFLAGS += $(PERLLDFLAGS) INCLUDES += -I. #needed for perlconnect/jsperl.c endif @@ -134,7 +134,7 @@ ifdef JS_READLINE # For those platforms with the readline library installed. DEFINES += -DEDITLINE -PROG_LIBS += -lreadline -ltermcap +PROG_LIBS += -lreadline -lncurses else ifdef JS_EDITLINE # Use the editline library, built locally. @@ -335,8 +335,8 @@ $(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