49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
Index: kyotocabinet-1.2.77/Makefile.in
|
|
===================================================================
|
|
--- kyotocabinet-1.2.77.orig/Makefile.in
|
|
+++ kyotocabinet-1.2.77/Makefile.in
|
|
@@ -56,7 +56,7 @@ LDFLAGS = @MYLDFLAGS@
|
|
CMDLDFLAGS = @MYCMDLDFLAGS@
|
|
CMDLIBS = @MYCMDLIBS@
|
|
LIBS = @LIBS@
|
|
-RUNENV = @MYLDLIBPATHENV@=@MYLDLIBPATH@
|
|
+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
|
|
POSTCMD = @MYPOSTCMD@
|
|
|
|
|
|
Index: kyotocabinet-1.2.77/configure.in
|
|
===================================================================
|
|
--- kyotocabinet-1.2.77.orig/configure.in
|
|
+++ kyotocabinet-1.2.77/configure.in
|
|
@@ -35,27 +35,18 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C
|
|
MYPCFILES="kyotocabinet.pc"
|
|
|
|
# Building flags
|
|
-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2"
|
|
+MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0"
|
|
MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0 -O2"
|
|
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I/usr/local/include"
|
|
+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
|
|
MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
|
|
MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
|
|
-MYLDFLAGS="-L. -L\$(LIBDIR) -L/usr/local/lib"
|
|
+MYLDFLAGS="-L. -L\$(LIBDIR)"
|
|
MYCMDLDFLAGS=""
|
|
MYCMDLIBS=""
|
|
MYLDLIBPATH=""
|
|
MYLDLIBPATHENV="LD_LIBRARY_PATH"
|
|
MYPOSTCMD="true"
|
|
|
|
-# Building paths
|
|
-PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH"
|
|
-CPATH=".:/usr/local/include:$CPATH"
|
|
-LIBRARY_PATH=".:/usr/local/lib:$LIBRARY_PATH"
|
|
-LD_LIBRARY_PATH=".:/usr/local/lib:$LD_LIBRARY_PATH"
|
|
-PKG_CONFIG_PATH=".:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
|
|
-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
|
|
-
|
|
-
|
|
|
|
#================================================================
|
|
# Options
|