Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv31783
Modified Files:
tokyocabinet9.info
Added Files:
tokyocabinet9.patch
Log Message:
tokyocabinet and tokyocabinet9 do not have same PatchFile-MD5 so rename 9's to
match .info filename
Index: tokyocabinet9.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/tokyocabinet9.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tokyocabinet9.info 3 Sep 2010 22:57:48 -0000 1.4
+++ tokyocabinet9.info 9 Jun 2011 23:53:56 -0000 1.5
@@ -9,7 +9,7 @@
Conflicts: tokyocabinet
Replaces: tokyocabinet
-PatchFile: tokyocabinet.patch
+PatchFile: tokyocabinet9.patch
PatchFile-MD5: 4db6d1458c829fb5fa502ca33a51d40e
ConfigureParams: --mandir=%p/share/man --datadir=%p/share/doc/%n
InstallScript: make DESTDIR=%d install
--- NEW FILE: tokyocabinet9.patch ---
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"
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
