@@ -11,14 +11,10 @@ OBJS = src/rumsort.o src/rum_ts_utils.o src/rumtsquery.o \
1111src/rumscan.o src/rumutil.o src/rumvacuum.o src/rumvalidate.o\
1212src/btree_rum.o src/rum_arr_utils.o$(WIN32RES )
1313
14- DATA_first = rum--1.0.sql
1514DATA_updates = rum--1.0--1.1.sql rum--1.1--1.2.sql\
1615 rum--1.2--1.3.sql
1716
18- DATA =$(DATA_first ) rum--$(EXTVERSION ) .sql$(DATA_updates )
19-
20- # Do not use DATA_built. It removes built files if clean target was used
21- SQL_built = rum--$(EXTVERSION ) .sql$(DATA_updates )
17+ DATA_built =$(EXTENSION ) --$(EXTVERSION ) .sql
2218
2319INCLUDES = rum.h rumsort.h
2420RELATIVE_INCLUDES =$(addprefix src/,$(INCLUDES ) )
@@ -28,8 +24,8 @@ LDFLAGS_SL += $(filter -lm, $(LIBS))
2824REGRESS = security rum rum_validate rum_hash ruminv timestamp orderby orderby_hash\
2925altorder altorder_hash limits\
3026int2 int4 int8 float4 float8 money oid\
31- \
32- \
27+ \
28+ \
3329numeric rum_weight expr
3430
3531TAP_TESTS = 1
@@ -47,6 +43,9 @@ include $(top_builddir)/src/Makefile.global
4743include $(top_srcdir ) /contrib/contrib-global.mk
4844endif
4945
46+ $(EXTENSION ) --$(EXTVERSION ) .sql
47+ cat$^ > $@
48+
5049ifeq ($(MAJORVERSION ) , 9.6)
5150# arrays are not supported on 9.6
5251else
@@ -61,16 +60,6 @@ wal-check: temp-install
6160check : wal-check
6261endif
6362
64- all :$(SQL_built )
65-
66- # 9.6 requires 1.3 file but 10.0 could live with update files
67- rum--$(EXTVERSION ) .sql :$(DATA_first ) $(DATA_updates )
68- cat$(DATA_first ) $(DATA_updates ) > rum--$(EXTVERSION ) .sql
69-
70- # rule for updates, e.g. rum--1.0--1.1.sql
71- rum--% .sql : gen_rum_sql--% .pl
72- perl$< > $@
73-
7463install : installincludes
7564
7665installincludes :
@@ -92,5 +81,5 @@ submake-rum:
9281
9382isolationcheck : | submake-isolation submake-rum temp-install
9483$(pg_isolation_regress_check ) \
95- $(top_srcdir ) /contrib/rum/logical.conf\
84+ $(top_srcdir ) /contrib/rum/logical.conf\
9685$(ISOLATIONCHECKS )
