Merge pull request #33 from umlaeute/enhancement/pd-lib-builder

Make path to Makefile.pdlibbuilder settable
agraef · Jul 10, 2023 · 4f98f01 · 4f98f01
2 parents 3dda515 + 8d16e7f
commit 4f98f01
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+.git*      	export-ignore
+.travis.yml	export-ignore
diff --git a/Makefile b/Makefile
@@ -17,11 +17,13 @@ pdlua_version := $(shell git describe --tags 2>/dev/null)
 
 luasrc = $(wildcard lua/onelua.c)
 
+PKG_CONFIG ?= pkg-config
+
 ifeq ($(luasrc),)
 # compile with installed liblua
 $(info ++++ NOTE: using installed lua)
-luaflags = $(shell pkg-config --cflags lua)
-lualibs = $(shell pkg-config --libs lua)
+luaflags = $(shell $(PKG_CONFIG) --cflags lua)
+lualibs = $(shell $(PKG_CONFIG) --libs lua)
 else
 # compile with Lua submodule
 $(info ++++ NOTE: using lua submodule)
@@ -44,7 +46,8 @@ pdlua.class.ldlibs := $(lualibs)
 
 datafiles = pd.lua $(wildcard pdlua*-help.pd)
 
-include Makefile.pdlibbuilder
+PDLIBBUILDER_DIR=.
+include $(PDLIBBUILDER_DIR)/Makefile.pdlibbuilder
 
 install: installplus