Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

v0.4

  • Loading branch information...
commit 91a1549bc93e1f9b182bf9fe642f90b216ba8e67 1 parent 69fe1f0
Cody Cutrer authored
Showing with 40 additions and 52 deletions.
  1. +9 −10 Changelog
  2. +18 −31 LICENSE
  3. +8 −7 Makefile
  4. +5 −4 README
19 Changelog
View
@@ -1,16 +1,15 @@
Changelog
-2006-06-09:
-- initial release of version 0.1
+Version 0.4 (2011-02-18):
+- improved Makefile portability (Robin Smidsrød)
+- LICENSE changed to MIT License
-2006-12-26:
-- added support for PostgreSQL version 8.2
-
-Release of version 0.2
-
-
-2009-05-01:
+Version 0.3 (2009-05-01):
- added support for PostgreSQL version 8.3
-Release of version 0.3
+Version 0.2 (2006-12-26):
+- added support for PostgreSQL version 8.2
+
+Version 0.1 (2006-06-09):
+- initial release
49 LICENSE
View
@@ -1,32 +1,19 @@
-/*
- * Copyright (c) 2006-2009 FlexiGuided GmbH, Berlin, Germany
- * Author: Jan Behrens <jan.behrens@flexiguided.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the FlexiGuided GmbH nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+Copyright (c) 2011 Public Software Group e. V., Berlin, Germany
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
15 Makefile
View
@@ -1,15 +1,16 @@
-icu_incdir = /usr/include
-icu_libdir = /usr/lib
+ICU_CFLAGS = `icu-config --cppflags-searchpath`
+ICU_LDFLAGS = `icu-config --ldflags`
+PG_INCLUDE_DIR = `pg_config --includedir-server`
+PG_PKG_LIB_DIR = `pg_config --pkglibdir`
collkey_icu.so: collkey_icu.o
- ld -shared -o collkey_icu.so collkey_icu.o --rpath $(icu_libdir) \
- $(icu_libdir)/libicui18n.so
+ ld -shared -o collkey_icu.so collkey_icu.o $(ICU_LDFLAGS)
collkey_icu.o: collkey_icu.c
- gcc -Wall -fpic -c -I $(icu_incdir) \
- -I `pg_config --includedir-server` \
- -o collkey_icu.o collkey_icu.c
+ gcc -Wall -fPIC $(ICU_CFLAGS) -I $(PG_INCLUDE_DIR) -o collkey_icu.o -c collkey_icu.c
clean:
rm -f *.o *.so
+install:
+ install collkey_icu.so $(PG_PKG_LIB_DIR)
9 README
View
@@ -26,11 +26,12 @@ recognized, so that 'test2' is placed before 'test10'.
*** INSTALLATION ***
-1. Edit the Makefile by setting a correct path to the library (icu_libdir)
- and include (icu_incdir) directory of libicu.
+1. Ensure icu-config and pg_config binaries are available to resolve
+ compilation flags for ICU and PostgreSQL.
2. Call 'make'.
-3. Copy the 'collkey_icu.so' to your PostgreSQL library directory,
- i.e. cp collkey_icu.so /usr/local/pgsql/lib
+3. Call 'make install' to install into your PostgreSQL library directory.
+ You will probably need to prefix this with "sudo" if you are a non-root
+ user.
Now you can use the 'collkey_icu.sql' file to enable the 'collkey' function
for a database.
Please sign in to comment.
Something went wrong with that request. Please try again.