make: easier installation with git submodule

.github/workflows/ci.yaml

@@ -11,7 +11,9 @@ jobs:
         pg-version: ['12', '13', '14', '15', '16']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
       - uses: cachix/install-nix-action@v18
         with:
           nix_path: nixpkgs=channel:nixos-unstable

.gitignore

@@ -2,3 +2,5 @@
 *.lex.c
 results/
 .history
+*.so
+*.bc

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "mustach"]
+	path = mustach
+	url = https://gitlab.com/jobol/mustach.git

Makefile

@@ -19,6 +19,14 @@ PGXS := $(shell $(PG_CONFIG) --pgxs)
 
 all: sql/$(EXTENSION)--$(EXTVERSION).sql $(EXTENSION).control
 
+.PHONY: clean_generated
+clean_generated:
+	rm -f $(EXTENSION).control
+	rm -f sql/$(EXTENSION)--$(EXTVERSION).sql
+
+# extra dep for clean target in pgxs.mk
+clean: clean_generated
+
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
 	cp $< $@
 

README.md

@@ -87,13 +87,35 @@ select show_cat('Mr. Sleepy', false);
 
 ## Installation
 
-Install https://gitlab.com/jobol/mustach, then on this repo:
+Clone the repo and submodules:
 
 ```
-$ make && make install
+git clone --recurse-submodules https://github.com/PostgREST/plmustache
 ```
 
-Tested on Postgres 12, 13, 14, 15, 16.
+Build mustach:
+
+```
+cd mustach
+make && sudo make install
+sudo ldconfig
+```
+
+Build plmustache:
+
+```
+cd ..
+
+make && sudo make install
+```
+
+Then on SQL you can do:
+
+```sql
+CREATE EXTENSION plmustache;
+```
+
+plmustache is tested on Postgres 12, 13, 14, 15, 16.
 
 ## Development
 

nix/mustach.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, pkg-config }:
+{ lib, stdenv, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "mustach";
@@ -8,10 +8,5 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" "VERSION=${version}"];
 
-  src = fetchFromGitLab {
-    owner = "jobol";
-    repo = pname;
-    rev    = "bd8a41030099c079aff57fcdfb1f5c0aa08cdbaf";
-    sha256 = "sha256-3kdXLp40QZo1+JoQUQNHOxuh/9cHhWvpz/ZFQ2MFXW8=";
-  };
+  src = ../mustach;
 }