chore: fix compilation with standard PGXS target

Author: steve-chavez

.gitignore

@@ -19,3 +19,4 @@ coverage_html
 nginx.pid
 tags
 net_worker.pid
+sql/pg_net--*.sql

Makefile

@@ -1,5 +1,4 @@
 SRC_DIR = src
-BUILD_DIR ?= build
 
 # the `-Wno`s quiet C90 warnings
 PG_CFLAGS = -std=c11 -Wextra -Wall -Werror \
@@ -23,32 +22,41 @@ REGRESS_OPTS = --use-existing --inputdir=test
 
 MODULE_big = $(EXTENSION)
 SRC = $(wildcard $(SRC_DIR)/*.c)
+
+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
 
 PG_CONFIG = pg_config
 SHLIB_LINK = -lcurl
 
 # Find <curl/curl.h> from system headers
 PG_CPPFLAGS := $(CPPFLAGS) -DEXTVERSION=\"$(EXTVERSION)\"
 
-build: $(BUILD_DIR)/$(EXTENSION).so $(BUILD_DIR)/$(EXTENSION)--$(EXTVERSION).sql $(BUILD_DIR)/$(EXTENSION).control
+all: sql/$(EXTENSION)--$(EXTVERSION).sql $(EXTENSION).control
+
+build: $(BUILD_DIR)/$(EXTENSION).so sql/$(EXTENSION)--$(EXTVERSION).sql $(EXTENSION).control
 
-$(BUILD_DIR)/.gitignore:
+$(BUILD_DIR)/.gitignore: sql/$(EXTENSION)--$(EXTVERSION).sql $(EXTENSION).control
 	mkdir -p $(BUILD_DIR)
+	cp $(EXTENSION).control $(BUILD_DIR)
+	cp sql/$(EXTENSION)--$(EXTVERSION).sql $(BUILD_DIR)
 	echo "*" > $(BUILD_DIR)/.gitignore
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/.gitignore
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
-$(BUILD_DIR)/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
-	cp $< $@
-
-$(BUILD_DIR)/$(EXTENSION).control:
-	sed "s/@PG_NET_VERSION@/$(EXTVERSION)/g" $(EXTENSION).control.in > $@
-
 $(BUILD_DIR)/$(EXTENSION).so: $(EXTENSION).so
 	mv $? $@
 
+sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
+	cp $< $@
+
+$(EXTENSION).control:
+	sed "s/@EXTVERSION@/$(EXTVERSION)/g" $(EXTENSION).control.in > $@
+
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 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

pg_net.control.in

@@ -1,3 +1,3 @@
 comment = 'Async HTTP'
-default_version = '@PG_NET_VERSION@'
+default_version = '@EXTVERSION@'
 relocatable = false