4e95df
--- configure.in	2009-08-31 05:36:58.000000000 -0400
4e95df
+++ configure.in.new	2009-09-30 12:02:41.608745987 -0400
a01dd7
@@ -31,26 +31,15 @@
b09211
 MYPCFILES="tokyocabinet.pc"
b09211
 
b09211
 # Building flags
b09211
-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
e24b54
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
e24b54
+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
e24b54
+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
e24b54
 MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
b09211
-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
b09211
+MYLDFLAGS="-L. -L\$(LIBDIR)"
c210f4
 MYCMDLDFLAGS=""
b09211
 MYRUNPATH="\$(LIBDIR)"
b09211
 MYLDLIBPATHENV="LD_LIBRARY_PATH"
b09211
 MYPOSTCMD="true"
b09211
 
b09211
-# Building paths
a01dd7
-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
a01dd7
-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
c210f4
-CPATH="$HOME/include:/usr/local/include:$CPATH"
b09211
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
b09211
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
b09211
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
c210f4
-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
b09211
-
b09211
-
b09211
-
b09211
 #================================================================
b09211
 # Options
b09211
 #================================================================
b27e7a
--- Makefile.in	2009-08-04 03:37:52.000000000 -0400
4e95df
+++ Makefile.in.new	2009-09-30 12:11:36.134746916 -0400
c210f4
@@ -54,8 +54,8 @@
b09211
 LDFLAGS = @MYLDFLAGS@
c210f4
 CMDLDFLAGS = @MYCMDLDFLAGS@
b09211
 LIBS = @LIBS@
b09211
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
b09211
-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
b27e7a
+LDENV = 
b09211
+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
b09211
 POSTCMD = @MYPOSTCMD@
b09211
 
b09211
 
c210f4
--- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
4e95df
+++ tokyocabinet.pc.in.new	2009-09-30 12:12:02.046746604 -0400
c210f4
@@ -10,5 +10,5 @@
b09211
 Name: Tokyo Cabinet
b09211
 Description: a modern implementation of DBM
b09211
 Version: @PACKAGE_VERSION@
b09211
-Libs: -L${libdir} -ltokyocabinet @LIBS@
b09211
+Libs: -L${libdir} -ltokyocabinet
b09211
 Cflags: -I${includedir}