Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a5b8735

Browse files
committedMay 17, 2016
Install libjulia to $(libdir) not $(private_libdir)
1 parent 3b92483 commit a5b8735

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -332,14 +332,14 @@ else
332332

333333
# Copy over .dSYM directories directly
334334
ifeq ($(OS),Darwin)
335-
-cp -a $(build_libdir)/*.dSYM $(DESTDIR)$(private_libdir)
335+
-cp -a $(build_libdir)/*.dSYM $(DESTDIR)$(libdir)
336336
-cp -a $(build_private_libdir)/*.dSYM $(DESTDIR)$(private_libdir)
337337
endif
338338

339339
for suffix in $(JL_LIBS) ; do \
340340
for lib in $(build_libdir)/lib$${suffix}*.$(SHLIB_EXT)*; do \
341341
if [ "$${lib##*.}" != "dSYM" ]; then \
342-
$(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
342+
$(INSTALL_M) $$lib $(DESTDIR)$(libdir) ; \
343343
fi \
344344
done \
345345
done
@@ -411,8 +411,8 @@ else ifeq ($(OS), Linux)
411411
endif
412412

413413
# Overwrite JL_SYSTEM_IMAGE_PATH in julia library
414-
$(call stringreplace,$(DESTDIR)$(private_libdir)/libjulia.$(SHLIB_EXT),sys.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys.$(SHLIB_EXT))
415-
$(call stringreplace,$(DESTDIR)$(private_libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))
414+
$(call stringreplace,$(DESTDIR)$(libdir)/libjulia.$(SHLIB_EXT),sys.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys.$(SHLIB_EXT))
415+
$(call stringreplace,$(DESTDIR)$(libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))
416416
endif
417417

418418
mkdir -p $(DESTDIR)$(sysconfdir)

0 commit comments

Comments
 (0)
Please sign in to comment.