Makefile.in  |  4 ++--

 configure.in | 13 +++----------

 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in

index 98ddeec..ae86052 100644

--- a/Makefile.in

+++ b/Makefile.in

@@ -55,8 +55,8 @@ CFLAGS = @MYCFLAGS@

 LDFLAGS = @MYLDFLAGS@

 CMDLDFLAGS = @MYCMDLDFLAGS@

 LIBS = @LIBS@

-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.

-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@

+LDENV = 

+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)

 POSTCMD = @MYPOSTCMD@

diff --git a/configure.in b/configure.in

index 30a3b37..9557e73 100644

--- a/configure.in

+++ b/configure.in

@@ -26,22 +26,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANKS doc"

 MYPCFILES="tokyodystopia.pc"

 # Building flags

-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"

-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"

-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"

+MYCFLAGS="$CFLAGS -std=c99 -fPIC -fsigned-char"

+MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1"

+MYLDFLAGS="-L. -L\$(LIBDIR)"

 MYCMDLDFLAGS=""

 MYRUNPATH="\$(LIBDIR)"

 MYLDLIBPATHENV="LD_LIBRARY_PATH"

 MYPOSTCMD="true"

 # Building paths

-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"

-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"

-CPATH="$HOME/include:/usr/local/include:$CPATH"

-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"

-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"

-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"

-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH

 if type pkg-config > /dev/null 2>&1

 then

   PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`"