OSSP CVS Repository

ossp - Check-in [5614]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 5614
Date: 2006-Jul-31 14:43:32 (local)
2006-Jul-31 12:43:32 (UTC)
User:rse
Branch:
Comment: Use "MODULE_PATHNAME" instead of "@MODULE_PATHNAME@" in uuid.sql.in to be more aligned to the PostgreSQL styles.

Submitted by: Simon "janus" Dassow <janus@errornet.de>

Tickets:
Inspections:
Files:
ossp-pkg/uuid/ChangeLog      1.129 -> 1.130     4 inserted, 0 deleted
ossp-pkg/uuid/pgsql/Makefile      1.2 -> 1.3     1 inserted, 1 deleted
ossp-pkg/uuid/pgsql/uuid.sql.in      1.4 -> 1.5     15 inserted, 15 deleted
ossp-pkg/uuid/ChangeLog 1.129 -> 1.130 

--- ChangeLog    2006/07/31 12:22:15     1.129
+++ ChangeLog    2006/07/31 12:43:32     1.130
@@ -13,6 +13,10 @@
 
   Changes between 1.5.0 and 1.5.1 (28-Jul-2006 to 31-Jul-2006)
 
+   o Use "MODULE_PATHNAME" instead of "@MODULE_PATHNAME@" in
+     uuid.sql.in to be more aligned to the PostgreSQL styles.
+     [Simon "janus" Dassow <janus@errornet.de>]
+
    o Use the available variables $(LIB_NAME), $(DCE_NAME) and
      $(CXX_NAME) more consistently in Makefile.in to allow packagers to
      override the library name with less patching.

ossp-pkg/uuid/pgsql/Makefile 1.2 -> 1.3 

--- Makefile     2006/01/12 20:31:51     1.2
+++ Makefile     2006/07/31 12:43:32     1.3
@@ -33,7 +33,7 @@
 include           $(top_builddir)/src/Makefile.shlib
 
 uuid.sql: uuid.sql.in
-        sed -e 's;@MODULE_PATHNAME@;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
+        sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
 
 install: all
         $(mkinstalldirs) $(DESTDIR)$(pkglibdir)

ossp-pkg/uuid/pgsql/uuid.sql.in 1.4 -> 1.5 

--- uuid.sql.in  2006/05/11 18:32:07     1.4
+++ uuid.sql.in  2006/07/31 12:43:32     1.5
@@ -72,22 +72,22 @@
 CREATE FUNCTION
     uuid_in(CSTRING) RETURNS uuid
     STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_in';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_in';
 
 CREATE FUNCTION
     uuid_out(uuid) RETURNS CSTRING
     STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_out';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_out';
 
 CREATE FUNCTION
     uuid_recv(INTERNAL) RETURNS uuid
     STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_in';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_in';
 
 CREATE FUNCTION
     uuid_send(uuid) RETURNS BYTEA
     STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_out';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_out';
 
 CREATE TYPE uuid (
     INPUT   = uuid_in,   -- for SQL input
@@ -115,17 +115,17 @@
 CREATE FUNCTION
     uuid(CSTRING) RETURNS uuid
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_in';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_in';
 
 CREATE FUNCTION
     uuid(INTEGER) RETURNS uuid
     VOLATILE CALLED ON NULL INPUT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_make';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_make';
 
 CREATE FUNCTION
     uuid(INTEGER, CSTRING, CSTRING) RETURNS uuid
     VOLATILE CALLED ON NULL INPUT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_make';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_make';
 
 --
 --  the UUID operators
@@ -134,32 +134,32 @@
 CREATE FUNCTION
     uuid_eq(uuid, uuid) RETURNS BOOL
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_eq';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_eq';
 
 CREATE FUNCTION
     uuid_ne(uuid, uuid) RETURNS BOOL
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_ne';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_ne';
 
 CREATE FUNCTION
     uuid_lt(uuid, uuid) RETURNS BOOL
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_lt';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_lt';
 
 CREATE FUNCTION
     uuid_gt(uuid, uuid) RETURNS BOOL
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_gt';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_gt';
 
 CREATE FUNCTION
     uuid_le(uuid, uuid) RETURNS BOOL
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_le';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_le';
 
 CREATE FUNCTION
     uuid_ge(uuid, uuid) RETURNS BOOL
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_ge';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_ge';
 
 CREATE OPERATOR = (
     leftarg    = uuid,
@@ -214,12 +214,12 @@
 CREATE FUNCTION
     uuid_hash(uuid) RETURNS INTEGER
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_hash';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_hash';
 
 CREATE FUNCTION
     uuid_cmp(uuid, uuid) RETURNS INTEGER
     IMMUTABLE STRICT
-    LANGUAGE C AS '@MODULE_PATHNAME@', 'pg_uuid_cmp';
+    LANGUAGE C AS 'MODULE_PATHNAME', 'pg_uuid_cmp';
 
 CREATE OPERATOR CLASS uuid_ops
     DEFAULT FOR TYPE uuid USING hash AS

CVSTrac 2.0.1