Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0525ddc

Browse files
committed
Bring chkpass build process into sync with other contrib modules;
make it use Makefile.shlib, etc.
1 parent119fd79 commit0525ddc

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed

‎contrib/chkpass/Makefile

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,51 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/chkpass/Makefile,v 1.1 2001/05/03 12:32:13 darcy Exp $
2+
# $Header: /cvsroot/pgsql/contrib/chkpass/Makefile,v 1.2 2001/08/23 16:50:33 tgl Exp $
33
#
44

55
subdir = contrib/chkpass
66
top_builddir = ../..
77
include$(top_builddir)/src/Makefile.global
88

9-
NAME:= chkpass
10-
SONAME:=$(NAME)$(DLSUFFIX)
9+
# override libdir to install shlib in contrib not main directory
10+
libdir:=$(libdir)/contrib
1111

12-
SQLS=$(NAME).sql
13-
MODS=$(NAME)$(DLSUFFIX)
12+
# shared library parameters
13+
NAME= chkpass
14+
SO_MAJOR_VERSION= 1
15+
SO_MINOR_VERSION= 0
1416

1517
overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)
16-
overrideCFLAGS +=$(CFLAGS_SL)
1718

1819
ifdefREFINT_VERBOSE
1920
overrideCPPFLAGS+= -DREFINT_VERBOSE
2021
endif
2122

22-
all:$(SONAME)$(NAME).sql
23+
OBJS= chkpass.o
24+
25+
all: all-lib$(NAME).sql
26+
27+
# Shared library stuff
28+
include$(top_srcdir)/src/Makefile.shlib
29+
2330

2431
$(NAME).sql:$(NAME).sql.in
25-
sed -e's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g'<$<>$@
32+
sed -e's:MODULE_PATHNAME:$(libdir)/$(shlib):g'<$<>$@
2633

27-
install: all installdirs
28-
$(INSTALL_SHLIB)$(SONAME)$(libdir)/contrib
29-
$(INSTALL_DATA) README.$(NAME)$(docdir)/contrib
30-
sed"s+%%PGDIR%%+$(libdir)+g"< chkpass.sql>$(datadir)/contrib
34+
install: all installdirs install-lib
35+
$(INSTALL_DATA)$(srcdir)/README.$(NAME)$(docdir)/contrib
36+
$(INSTALL_DATA)$(NAME).sql$(datadir)/contrib
3137

3238
installdirs:
33-
$(mkinstalldirs)$(libdir)/contrib$(docdir)/contrib$(datadir)/contrib
39+
$(mkinstalldirs)$(docdir)/contrib$(datadir)/contrib$(libdir)
3440

35-
uninstall:
36-
rm -f$(libdir)/contrib/$(SONAME)$(docdir)/contrib/README.$(NAME)\
37-
$(addprefix$(datadir)/contrib/,$(NAME).sql)
41+
uninstall: uninstall-lib
42+
rm -f$(docdir)/contrib/README.$(NAME)$(datadir)/contrib/$(NAME).sql
3843

39-
cleandistcleanmaintainer-clean:
40-
rm -f$(SONAME)$(NAME).sql
44+
cleandistcleanmaintainer-clean: clean-lib
45+
rm -f$(OBJS)$(NAME).sql
4146

4247
dependdep:
43-
$(CC) -MM -MG$(CFLAGS)*.c>depend
48+
$(CC) -MM -MG$(CFLAGS)*.c>depend
4449

4550
ifeq (depend,$(wildcard depend))
4651
include depend

‎contrib/chkpass/chkpass.sqlrenamed to‎contrib/chkpass/chkpass.sql.in

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,23 @@
44
-- darcy@druid.net
55
-- http://www.druid.net/darcy/
66
--
7-
-- $Header: /cvsroot/pgsql/contrib/chkpass/Attic/chkpass.sql,v 1.2 2001/08/10 18:57:32 tgl Exp $
7+
-- $Header: /cvsroot/pgsql/contrib/chkpass/chkpass.sql.in,v 1.1 2001/08/23 16:50:33 tgl Exp $
8+
--
89
-- best viewed with tabs set to 4
9-
-- %%PGDIR%% changed to your local directory where modules is
1010
--
1111

12-
load'%%PGDIR%%/modules/chkpass.so';
13-
1412
--
1513
--Input and output functions and the type itself:
1614
--
1715

1816
create function chkpass_in(opaque)
1917
returns opaque
20-
as'%%PGDIR%%/modules/chkpass.so'
18+
as 'MODULE_PATHNAME'
2119
language 'c';
2220

2321
create function chkpass_out(opaque)
2422
returns opaque
25-
as'%%PGDIR%%/modules/chkpass.so'
23+
as 'MODULE_PATHNAME'
2624
language 'c';
2725

2826
create type chkpass (
@@ -34,7 +32,7 @@ create type chkpass (
3432

3533
create function raw(chkpass)
3634
returns text
37-
as'%%PGDIR%%/modules/chkpass.so','chkpass_rout'
35+
as 'MODULE_PATHNAME', 'chkpass_rout'
3836
language 'c';
3937

4038
--
@@ -43,12 +41,12 @@ create function raw(chkpass)
4341

4442
create function eq(chkpass, text)
4543
returns bool
46-
as'%%PGDIR%%/modules/chkpass.so','chkpass_eq'
44+
as 'MODULE_PATHNAME', 'chkpass_eq'
4745
language 'c';
4846

4947
create function ne(chkpass, text)
5048
returns bool
51-
as'%%PGDIR%%/modules/chkpass.so','chkpass_ne'
49+
as 'MODULE_PATHNAME', 'chkpass_ne'
5250
language 'c';
5351

5452
--

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp