Group :: Databases
RPM: tokyotyrant
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: tokyotyrant-1.1.40-alt.patch
Download
Download
Makefile.in | 12 ++++++------
configure.in | 18 +++++-------------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 9bd5fc6..03e17de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,8 +58,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@
@@ -299,8 +299,8 @@ ttskeldir.so : ttskeldir.o
$(CC) $(CFLAGS) -shared -o $@ $< $(LDFLAGS) $(LIBS)
-ttskelproxy.so : ttskelproxy.o
- $(CC) $(CFLAGS) -shared -o $@ $< $(LDFLAGS) $(LIBS)
+ttskelproxy.so : ttskelproxy.o libtokyotyrant.so
+ $(CC) $(CFLAGS) -shared -o $@ $< $(LDFLAGS) -ltokyotyrant $(LIBS)
ttskelnull.so : ttskelnull.o
@@ -315,8 +315,8 @@ ttskeldir.bundle : ttskeldir.o
$(CC) $(CFLAGS) -bundle -flat_namespace -undefined suppress -o $@ $< $(LDFLAGS) $(LIBS)
-ttskelproxy.bundle : ttskelproxy.o
- $(CC) $(CFLAGS) -bundle -flat_namespace -undefined suppress -o $@ $< $(LDFLAGS) $(LIBS)
+ttskelproxy.bundle : ttskelproxy.o libtokyotyrant.dylib
+ $(CC) $(CFLAGS) -bundle -flat_namespace -undefined suppress -o $@ $< $(LDFLAGS) -ltokyotyrant $(LIBS)
ttskelnull.bundle : ttskelnull.o
diff --git a/configure.in b/configure.in
index a3d147f..2112dc4 100644
--- a/configure.in
+++ b/configure.in
@@ -28,29 +28,21 @@ MYDOCUMENTFILES="COPYING ChangeLog THANKS doc"
MYPCFILES="tokyotyrant.pc"
# Building flags
-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
-MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
-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 -D_REENTRANT -D__EXTENSIONS__"
+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`"
- CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`"
LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
+ CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`"
+ export PATH LIBRARY_PATH CPATH
fi