Unapply patch from git

Makefile

@@ -25,7 +25,13 @@ include $(PGXS)
 PGVER := $(shell echo $(VERSION) | sed "s/^\([^\.]\+\)\..*/\1/" )
 PGVERNEW := $(shell if [ $(PGVER) -ge 12 ] ; then echo N ; else echo O ; fi )
 
-MYBINLIBS := -L$(shell $(PG_CONFIG) --pkglibdir) -lpgport -lm
+ifeq ($(PGVERNEW), N)
+	PG_LIBS += -L$(shell $(PG_CONFIG) --pkglibdir)
+	LIBS := $(filter-out -lpam -lxml2 -lxslt -lselinux -ledit, $(LIBS))
+	MYBINLIBS := $(LIBS) $(PG_LIBS) -lm
+else
+	MYBINLIBS := $(PG_LIBS) -lm
+endif
 
 dump.c: prepare
 	./prepare
@@ -36,7 +42,7 @@ prepare: prepare.o q3cube.o q3c_poly.o
 gen_data: gen_data.c
 	$(CC) $< $(CPPFLAGS) $(PG_LFGLAGS) $(LDFLAGS) $(MYBINLIBS) -o $@
 
-test: gen_data
+test: gen_data all
 	createdb q3c_test
 	psql q3c_test -c "CREATE TABLE test (ra double precision, dec double precision)"
 	psql q3c_test -c "CREATE TABLE test1 (ra double precision, dec double precision)"