diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2006-07-11 06:32:43 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2006-07-11 06:32:43 +0000 |
| commit | 9a15142fc3bfa7418724853130ab426e4ab14c7b (patch) | |
| tree | 5d6e27c4b9d566aff3af1a2333988dc57d7f4040 /databases/fastdb/files/patch-makefile | |
| parent | Add p5-XML-RSS-Liberal 0.01, XML::RSS With A Liberal Parser. (diff) | |
Unbreak size mismatch by update to 3.29.
Submitted by: chinsan aka chinsan dot tw at gmail dot com
PR: 100059
Notes
Notes:
svn path=/head/; revision=167439
Diffstat (limited to 'databases/fastdb/files/patch-makefile')
| -rw-r--r-- | databases/fastdb/files/patch-makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/databases/fastdb/files/patch-makefile b/databases/fastdb/files/patch-makefile index d3998871cbb1..e114ad36ac11 100644 --- a/databases/fastdb/files/patch-makefile +++ b/databases/fastdb/files/patch-makefile @@ -1,5 +1,5 @@ ---- makefile.orig Wed Feb 15 13:12:09 2006 -+++ makefile Wed Feb 15 13:16:38 2006 +--- makefile.orig Tue Jul 11 12:39:16 2006 ++++ makefile Tue Jul 11 12:45:31 2006 @@ -33,11 +33,11 @@ SUFF= else @@ -16,7 +16,7 @@ endif SUFF=_r endif -@@ -67,21 +67,21 @@ +@@ -67,21 +67,22 @@ WEB_EXAMPLES = cgistub bugdb clidb @@ -31,7 +31,7 @@ +CFLAGS = -c -Iinc ${CXXFLAGS} -fPIC $(DEFS) $(TFLAGS) #CFLAGS = -c -Iinc -Wall -O0 -fPIC -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS) --#SHFLAGS=-shared -Wl,-soname,$@ + #SHFLAGS=-shared -Wl,-soname,$@ -SHFLAGS=-shared +SHFLAGS=-shared -Wl,-soname,$@ +#SHFLAGS=-shared @@ -43,7 +43,7 @@ AR = ar ARFLAGS = -cru -@@ -355,24 +355,22 @@ +@@ -367,24 +368,20 @@ install: subsql cleanupsem installlib mkdir -p $(BINSPATH) @@ -61,12 +61,10 @@ mkdir -p $(LIBSPATH) - cp $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH) + ${BSD_INSTALL_PROGRAM} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH) - ln -f -s $(LIBSPATH)/$(FASTDB_SHARED) $(LIBSPATH)/libfastdb$(SUFF).so - ln -f -s $(LIBSPATH)/$(CLI_SHARED) $(LIBSPATH)/libcli$(SUFF).so -- -cp $(JNI_LIB) $(LIBSPATH) -- -ln -f -s $(LIBSPATH)/$(JNI_LIB) $(LIBSPATH)/libjnicli$(SUFF).so -+# -cp $(JNI_LIB) $(LIBSPATH) -+# -ln -f -s $(LIBSPATH)/$(JNI_LIB) $(LIBSPATH)/libjnicli$(SUFF).so + (cd $(LIBSPATH) && ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so \ + && ln -f -s $(CLI_SHARED) libcli$(SUFF).so) +- if [ -f $(JNI_LIB) ]; then cp $(JNI_LIB) $(LIBSPATH); \ +- cd $(LIBSPATH) && ln -f -s $(JNI_LIB) libjnicli$(SUFF).so; fi uninstall: rm -fr $(INCSPATH) |