Skip to content

Commit 0561794

Browse files
author
davilla
committed
changed, install libbluray into /usr/lib on Linux because XB_FIND_SONAME can't find it in /usr/local/lib, revert later
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32602 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
1 parent 0bc76c3 commit 0561794

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

lib/libbluray/Makefile

+10-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# Usage:
1313
# make
1414
# sudo make install
15+
#
16+
# Darwin only:
1517
# make install_xbmc
1618

1719
# get OS type from shell
@@ -22,9 +24,15 @@ ifeq ($(OSTYPE),Darwin)
2224
CFLAGS=-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I /opt/local/include
2325
LDFLAGS=-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -L/opt/local/lib
2426
CPPFLAGS=-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I /opt/local/include
27+
else
28+
prefix=/usr
2529
endif
2630

27-
LIBBLURAY = libbluray/src/.libs/libbluray.dylib
31+
ifeq ($(OSTYPE),Darwin)
32+
LIBBLURAY = libbluray/src/.libs/libbluray.dylib
33+
else
34+
LIBBLURAY = libbluray/src/.libs/libbluray.so
35+
endif
2836

2937
all:: $(LIBBLURAY)
3038

@@ -37,7 +45,7 @@ libbluray/configure:
3745
ifeq ($(OSTYPE),Darwin)
3846
cd libbluray; ./configure --prefix=$(prefix) --exec-prefix=$(prefix) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
3947
else
40-
cd libbluray; ./configure
48+
cd libbluray; ./configure --prefix=$(prefix) --exec-prefix=$(prefix)
4149
endif
4250

4351
ifeq ($(OSTYPE),Darwin)

0 commit comments

Comments
 (0)