c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Bring chkpass build process into sync with other contrib modules;

Browse source 
make it use Makefile.shlib, etc.
This commit is contained in:
Tom Lane 2001-08-23 16:50:33 +00:00
parent 119fd7956a
commit 0525ddc3e5
2 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
contrib/chkpass/Makefile
View file

@ -1,46 +1,51 @@
# #
# $Header: /cvsroot/pgsql/contrib/chkpass/Makefile,v 1.1 2001/05/03 12:32:13 darcy Exp $ # $Header: /cvsroot/pgsql/contrib/chkpass/Makefile,v 1.2 2001/08/23 16:50:33 tgl Exp $
# #
subdir = contrib/chkpass subdir = contrib/chkpass
top_builddir = ../.. top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
NAME := chkpass # override libdir to install shlib in contrib not main directory
SONAME := $(NAME)$(DLSUFFIX) libdir := $(libdir)/contrib
SQLS = $(NAME).sql # shared library parameters
MODS = $(NAME)$(DLSUFFIX) NAME= chkpass
SO_MAJOR_VERSION= 1
SO_MINOR_VERSION= 0
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
ifdef REFINT_VERBOSE ifdef REFINT_VERBOSE
override CPPFLAGS+= -DREFINT_VERBOSE override CPPFLAGS+= -DREFINT_VERBOSE
endif endif
all: $(SONAME) $(NAME).sql OBJS= chkpass.o
all: all-lib $(NAME).sql
# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
$(NAME).sql: $(NAME).sql.in $(NAME).sql: $(NAME).sql.in
sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@ sed -e 's:MODULE_PATHNAME:$(libdir)/$(shlib):g' < $< > $@
install: all installdirs install: all installdirs install-lib
$(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib $(INSTALL_DATA) $(srcdir)/README.$(NAME) $(docdir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib $(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
sed "s+%%PGDIR%%+$(libdir)+g" < chkpass.sql > $(datadir)/contrib
installdirs: installdirs:
$(mkinstalldirs) $(libdir)/contrib $(docdir)/contrib $(datadir)/contrib $(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)
uninstall: uninstall: uninstall-lib
rm -f $(libdir)/contrib/$(SONAME) $(docdir)/contrib/README.$(NAME) \ rm -f $(docdir)/contrib/README.$(NAME) $(datadir)/contrib/$(NAME).sql
$(addprefix $(datadir)/contrib/, $(NAME).sql)
clean distclean maintainer-clean: clean distclean maintainer-clean: clean-lib
rm -f $(SONAME) $(NAME).sql rm -f $(OBJS) $(NAME).sql
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c >depend
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend

18
contrib/chkpass/chkpass.sql → contrib/chkpass/chkpass.sql.in
View file

@ -4,12 +4,10 @@
-- darcy@druid.net -- darcy@druid.net
-- http://www.druid.net/darcy/ -- http://www.druid.net/darcy/
-- --
-- $Header: /cvsroot/pgsql/contrib/chkpass/Attic/chkpass.sql,v 1.2 2001/08/10 18:57:32 tgl Exp $ -- $Header: /cvsroot/pgsql/contrib/chkpass/chkpass.sql.in,v 1.1 2001/08/23 16:50:33 tgl Exp $
-- best viewed with tabs set to 4 --
-- %%PGDIR%% changed to your local directory where modules is -- best viewed with tabs set to 4
-- --
load '%%PGDIR%%/modules/chkpass.so';
-- --
-- Input and output functions and the type itself: -- Input and output functions and the type itself:
@ -17,12 +15,12 @@ load '%%PGDIR%%/modules/chkpass.so';
create function chkpass_in(opaque) create function chkpass_in(opaque)
returns opaque returns opaque
as '%%PGDIR%%/modules/chkpass.so' as 'MODULE_PATHNAME'
language 'c'; language 'c';
create function chkpass_out(opaque) create function chkpass_out(opaque)
returns opaque returns opaque
as '%%PGDIR%%/modules/chkpass.so' as 'MODULE_PATHNAME'
language 'c'; language 'c';
create type chkpass ( create type chkpass (
@ -34,7 +32,7 @@ create type chkpass (
create function raw(chkpass) create function raw(chkpass)
returns text returns text
as '%%PGDIR%%/modules/chkpass.so', 'chkpass_rout' as 'MODULE_PATHNAME', 'chkpass_rout'
language 'c'; language 'c';
-- --
@ -43,12 +41,12 @@ create function raw(chkpass)
create function eq(chkpass, text) create function eq(chkpass, text)
returns bool returns bool
as '%%PGDIR%%/modules/chkpass.so', 'chkpass_eq' as 'MODULE_PATHNAME', 'chkpass_eq'
language 'c'; language 'c';
create function ne(chkpass, text) create function ne(chkpass, text)
returns bool returns bool
as '%%PGDIR%%/modules/chkpass.so', 'chkpass_ne' as 'MODULE_PATHNAME', 'chkpass_ne'
language 'c'; language 'c';
-- --