diff --git a/Makefile.in b/Makefile.in index 408b58e..842e268 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,8 +37,8 @@ datarootdir = @datarootdir@ INCLUDEDIR = @includedir@ LIBDIR = @libdir@ BINDIR = @bindir@ -LIBEXECDIR = @libexecdir@ -DATADIR = @datadir@/$(PACKAGE) +LIBEXECDIR = @libdir@/$(PACKAGE) +DATADIR = @datadir@ MAN1DIR = @mandir@/man1 MAN3DIR = @mandir@/man3 PCDIR = @libdir@/pkgconfig @@ -54,8 +54,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 = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):@MYRUNPATH@:. +RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):@MYRUNPATH@ POSTCMD = @MYPOSTCMD@ diff --git a/configure b/configure index bb0e147..9aa8512 100755 --- a/configure +++ b/configure @@ -1856,9 +1856,9 @@ MYPCFILES="tokyocabinet.pc" # Building flags MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" -MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" +MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" +MYLDFLAGS="-L. -L\$(LIBDIR)" MYCMDLDFLAGS="" MYRUNPATH="\$(LIBDIR)" MYLDLIBPATHENV="LD_LIBRARY_PATH"