From 99c107c2606591950860dfd8de7551ceb7411330 Mon Sep 17 00:00:00 2001 From: axtloss Date: Thu, 8 Aug 2024 12:47:26 +0200 Subject: [PATCH] fix: Fix installprefix not being set correctly during build --- Makefile | 2 +- core/plugins.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7d6a11b..a18171d 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ all: build # plugins build: mkdir -p build - sed 's|$$INSTALLPREFIX$$|${PREFIX}|g' core/plugins.in > core/plugins.go + sed 's|%INSTALLPREFIX%|${PREFIX}|g' core/plugins.in > core/plugins.go go build -a -o build/${BINARY_NAME} build-plugins: FORCE diff --git a/core/plugins.in b/core/plugins.in index b4338dd..615fc5b 100644 --- a/core/plugins.in +++ b/core/plugins.in @@ -26,7 +26,7 @@ func LoadPlugin(name string, module interface{}, recipe *api.Recipe) (string, er localPluginPath := fmt.Sprintf("%s/%s.so", recipe.PluginPath, name) - globalPluginPath := fmt.Sprintf("$INSTALLPREFIX$/share/vib/plugins/%s.so", name) + globalPluginPath := fmt.Sprintf("%INSTALLPREFIX%/share/vib/plugins/%s.so", name) // Prefer local plugins before global ones var loadedPlugin uintptr