fix: compilation with standard PGXS target

Using the EXTENSION variable implicitly requires a .control file.

Also ensure `all` is the default target.

Author: steve-chavez

Makefile

@@ -17,14 +17,11 @@ ifeq ($(COVERAGE), 1)
 PG_CFLAGS += --coverage
 endif
 
-EXTENSION = supautils
-MODULE_big = $(EXTENSION)
+MODULE_big = supautils
 
 SRC_DIR = src
-BUILD_DIR ?= build
 
 SRC = $(wildcard src/*.c)
-OBJS = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o, $(SRC))
 
 PG_VERSION = $(strip $(shell $(PG_CONFIG) --version | $(GREP) -oP '(?<=PostgreSQL )[0-9]+'))
 # 0 is true
@@ -56,6 +53,8 @@ EXTRA_CLEAN = $(GENERATED_OUT)
 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 
+.DEFAULT_GOAL := all
+
 ifeq ($(OS), Linux)
   DL_SUFFIX=so
 else ifeq ($(OS), Darwin)
@@ -68,7 +67,15 @@ else
   DL_SUFFIX=dylib
 endif
 
-build: $(BUILD_DIR)/$(EXTENSION).$(DL_SUFFIX) test/init.conf
+PG_CPPFLAGS := $(CPPFLAGS) -DTEST=1
+
+ifdef BUILD_DIR
+OBJS = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o, $(SRC))
+else
+OBJS = $(patsubst $(SRC_DIR)/%.c, src/%.o, $(SRC)) # if no BUILD_DIR, just build on src so standard PGXS `make` works
+endif
+
+build: $(BUILD_DIR)/$(MODULE_big).$(DL_SUFFIX) test/init.conf
 
 .PHONY: test/init.conf
 test/init.conf: test/init.conf.in
@@ -82,16 +89,14 @@ else
 		$? > $@
 endif
 
-PG_CPPFLAGS := $(CPPFLAGS) -DTEST=1
-
 $(BUILD_DIR)/.gitignore:
 	mkdir -p $(BUILD_DIR)
 	echo "*" > $(BUILD_DIR)/.gitignore
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/.gitignore
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
-$(BUILD_DIR)/$(EXTENSION).$(DL_SUFFIX): $(EXTENSION).$(DL_SUFFIX)
+$(BUILD_DIR)/$(MODULE_big).$(DL_SUFFIX): $(MODULE_big).$(DL_SUFFIX)
 	mv $? $@
 
 include $(PGXS)

nix/xpg.nix

@@ -3,8 +3,8 @@ let
   dep = fetchFromGitHub {
     owner  = "steve-chavez";
     repo   = "xpg";
-    rev    = "v1.3.0";
-    sha256 = "sha256-jDELiBbnCpRXIpod7msnhMfGcrW0pR3snDQ5T81nO0I=";
+    rev    = "v1.3.2";
+    sha256 = "sha256-ooYqMOQD9y+/87wBd33Mvbpsx+FwEMdZoibGRM4gvBk=";
   };
   xpg = import dep;
 in