36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -175,7 +175,7 @@
|
|
LJEMALLOC := $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB)
|
|
endif
|
|
PC := $(objroot)jemalloc.pc
|
|
-DOCS_XML := $(objroot)doc/jemalloc$(install_suffix).xml
|
|
+DOCS_XML := $(srcroot)doc/jemalloc$(install_suffix).xml
|
|
DOCS_HTML := $(DOCS_XML:$(objroot)%.xml=$(objroot)%.html)
|
|
DOCS_MAN3 := $(DOCS_XML:$(objroot)%.xml=$(objroot)%.3)
|
|
DOCS := $(DOCS_HTML) $(DOCS_MAN3)
|
|
@@ -513,7 +513,7 @@
|
|
|
|
$(objroot)lib/$(LIBJEMALLOC).$(SOREV) : $(if $(PIC_CFLAGS),$(C_PIC_OBJS),$(C_OBJS)) $(if $(PIC_CFLAGS),$(CPP_PIC_OBJS),$(CPP_OBJS))
|
|
@mkdir -p $(@D)
|
|
- $(CC) $(DSO_LDFLAGS) $(call RPATH,$(RPATH_EXTRA)) $(LDTARGET) $+ $(LDFLAGS) $(LIBS) $(EXTRA_LDFLAGS)
|
|
+ $(CC) $(DSO_LDFLAGS) $(call RPATH,$(RPATH_EXTRA)) $(LDTARGET) -Wl,--out-implib,$(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB).$(A) $+ $(LDFLAGS) $(LIBS) $(EXTRA_LDFLAGS)
|
|
|
|
$(objroot)lib/$(LIBJEMALLOC)_pic.$(A) : $(C_PIC_OBJS) $(CPP_PIC_OBJS)
|
|
$(objroot)lib/$(LIBJEMALLOC).$(A) : $(C_OBJS) $(CPP_OBJS)
|
|
@@ -565,10 +565,12 @@
|
|
done
|
|
|
|
install_lib_shared: $(DSOS)
|
|
+ $(INSTALL) -d $(BINDIR)
|
|
+ $(INSTALL) -m 755 $(objroot)lib/$(LIBJEMALLOC).$(SOREV) $(BINDIR)
|
|
$(INSTALL) -d $(LIBDIR)
|
|
- $(INSTALL) -v -m 755 $(objroot)lib/$(LIBJEMALLOC).$(SOREV) $(LIBDIR)
|
|
+ $(INSTALL) -v -m 644 $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB).$(A) $(LIBDIR)
|
|
ifneq ($(SOREV),$(SO))
|
|
- ln -sf $(LIBJEMALLOC).$(SOREV) $(LIBDIR)/$(LIBJEMALLOC).$(SO)
|
|
+ ln -sf $(LIBJEMALLOC).$(SOREV) $(BINDIR)/$(LIBJEMALLOC).$(SO)
|
|
endif
|
|
|
|
install_lib_static: $(STATIC_LIBS)
|