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

Commit8f82141

Browse files
committed
Restore Peter's makefile fixes.
1 parent7c9f295 commit8f82141

File tree

1 file changed

+11
-24
lines changed

1 file changed

+11
-24
lines changed

‎contrib/intarray/Makefile

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.5 2001/03/18 23:35:18 tgl Exp $
2+
13
subdir = contrib/intarray
24
top_builddir = ../..
35
include$(top_builddir)/src/Makefile.global
@@ -10,7 +12,7 @@ NAME= _int
1012
SO_MAJOR_VERSION= 1
1113
SO_MINOR_VERSION= 0
1214

13-
overrideCPPFLAGS+= -I$(srcdir) -DPGSQL71
15+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS) -DPGSQL71
1416

1517
OBJS= _int.o
1618

@@ -21,46 +23,31 @@ include $(top_srcdir)/src/Makefile.shlib
2123

2224

2325
$(NAME).sql:$(NAME).sql.in
24-
sed-e's:MODULE_PATHNAME:$(libdir)/$(shlib):g'<$<>$@
26+
sed's,MODULE_PATHNAME,$(libdir)/$(shlib),g'$<>$@
2527

2628
.PHONY: submake
2729
submake:
2830
$(MAKE) -C$(top_builddir)/src/test/regress pg_regress
2931

30-
# against installed postmaster
3132
installcheck: submake
3233
$(top_builddir)/src/test/regress/pg_regress _int
3334

34-
# in-tree test doesn't work yet (no way to install my shared library)
35-
#check: all submake
36-
#$(top_builddir)/src/test/regress/pg_regress --temp-install\
37-
# --top-builddir=$(top_builddir) _int
3835
check:
39-
@echo"'make check' is not supported."
40-
@echo"Do 'make install', then 'make installcheck' instead."
36+
@echo"'$(MAKE) check' is not supported."
37+
@echo"Do '$(MAKE) install', then '$(MAKE) installcheck' instead."
4138

4239
install: all installdirs install-lib
43-
#$(INSTALL_DATA) $(srcdir)/README.$(NAME) $(docdir)/contrib
40+
$(INSTALL_DATA)$(srcdir)/README.intarray$(docdir)/contrib
4441
$(INSTALL_DATA)$(NAME).sql$(datadir)/contrib
4542

4643
installdirs:
4744
$(mkinstalldirs)$(docdir)/contrib$(datadir)/contrib$(libdir)
4845

4946
uninstall: uninstall-lib
50-
rm -f$(docdir)/contrib/README.$(NAME)$(datadir)/contrib/$(NAME).sql
47+
rm -f$(docdir)/contrib/README.intarray$(datadir)/contrib/$(NAME).sql
5148

5249
cleandistcleanmaintainer-clean: clean-lib
53-
rm -f*.so y.tab.c y.tab.h$(OBJS)$(NAME).sql
50+
rm -f$(OBJS)$(NAME).sql
5451
# things created by various check targets
55-
rm -rf results tmp_check log
56-
rm -f regression.diffs regression.out regress.out run_check.out
57-
ifeq ($(PORTNAME), win)
58-
rm -f regress.def
59-
endif
60-
61-
dependdep:
62-
$(CC) -MM$(CFLAGS)*.c>depend
63-
64-
ifeq (depend,$(wildcard depend))
65-
include depend
66-
endif
52+
rm -rf results
53+
rm -f regression.diffs regression.out

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp