$NetBSD: patch-ae,v 1.2 2007/08/12 03:04:33 wiz Exp $ --- Makefile.ref.orig 2006-08-21 14:58:45.000000000 -0400 +++ Makefile.ref @@ -55,8 +55,6 @@ include config.mk ifdef USE_MSVC OTHER_LIBS += fdlibm/$(OBJDIR)/fdlibm.lib -else -OTHER_LIBS += -Lfdlibm/$(OBJDIR) -lfdm endif ifdef JS_THREADSAFE @@ -80,7 +78,8 @@ endif # # XCFLAGS may be set in the environment or on the gmake command line # -CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) +CFLAGS += -L$(PREFIX)/lib $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) \ + $(INCLUDES) $(XCFLAGS) LDFLAGS = $(XLDFLAGS) @@ -248,12 +247,9 @@ JS_CFILES = \ prmjtime.c \ $(NULL) -PREDIRS += fdlibm ifdef USE_MSVC FDLIBM_LIBRARY = fdlibm/$(OBJDIR)/fdlibm.lib -else -FDLIBM_LIBRARY = fdlibm/$(OBJDIR)/libfdm.a endif JSMATH_PRELINK = $(OBJDIR)/jsmathtemp.o # Flag for incremental linking @@ -307,9 +303,9 @@ ifdef USE_MSVC $(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY) link.exe -out:"$@" $(EXE_LINK_FLAGS) $^ else -$(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY) - $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \ - $(PROG_LIBS) +$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY) $(FDLIBM_LIBRARY) + $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) $(LDFLAGS) \ + $(OTHER_LIBS) $(PROG_LIBS) -ljs -lm endif $(PROGRAM).pure: $(PROG_OBJS) $(LIBRARY)