diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use DESTDIR for Java (patch for Kerri Harris).

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-05-15 22:05:46 +01:00
parent fd9f4efe0b
commit b903008f7a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -6590,7 +6590,7 @@ fi
LDFLAGS="-dynamic $LDFLAGS" LDFLAGS="-dynamic $LDFLAGS"
;; ;;
x86*) x86*)
JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server"
JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
if test "$CC" != "lcc" if test "$CC" != "lcc"
then then
@ -6598,7 +6598,7 @@ fi
fi fi
;; ;;
*) *)
JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server"
JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
if test "$CC" != "lcc" if test "$CC" != "lcc"
then then

4
configure.in
View File

@ -810,7 +810,7 @@ case "$target_os" in
LDFLAGS="-dynamic $LDFLAGS" LDFLAGS="-dynamic $LDFLAGS"
;; ;;
x86*) x86*)
JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server"
JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
if test "$CC" != "lcc" if test "$CC" != "lcc"
then then
@ -818,7 +818,7 @@ case "$target_os" in
fi fi
;; ;;
*) *)
JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server"
JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
if test "$CC" != "lcc" if test "$CC" != "lcc"
then then