Skip to content

Commit 5086ebe

Browse files
committed
Merge branch 'master' of github.com:Audio4Linux/JDSP4Linux
2 parents e04c557 + a688144 commit 5086ebe

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

libjamesdsp/libjamesdsp.pro

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,12 @@ SOURCES += \
101101
JdspImpResToolbox.c
102102

103103
unix {
104-
target.path = /usr/lib
104+
isEmpty(LIBDIR) {
105+
LIBDIR = lib
106+
}
107+
108+
LIBDIR = $$absolute_path($$LIBDIR, $$PREFIX)
109+
target.path = $$LIBDIR
105110
}
106111
else: error("Static linking only available on Linux systems")
107112

src/src.pro

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,17 @@ RESOURCES += \
173173
../resources/resources.qrc
174174

175175
# Default rules for deployment.
176-
qnx: target.path = /tmp/$${TARGET}/bin
177-
else: unix:!android: target.path = /usr/bin/
176+
isEmpty(PREFIX){
177+
qnx: PREFIX = /tmp/$${TARGET}
178+
else: unix:!android: PREFIX = /usr
179+
}
180+
181+
isEmpty(BINDIR) {
182+
BINDIR = bin
183+
}
178184

185+
BINDIR = $$absolute_path($$BINDIR, $$PREFIX)
186+
target.path = $$BINDIR
179187
!isEmpty(target.path): INSTALLS += target
180188

181189
unix {

0 commit comments

Comments
 (0)