From 529e1147a199fa4a2945c75d22024ac41bfbe0fa Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 3 Jan 2024 17:24:12 -0600 Subject: [PATCH] allow multiple copies to be installed Signed-off-by: Jeff Carr --- debian/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index 993769d..4c48021 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -1,6 +1,8 @@ # GITVERSION=$(shell git rev-parse FETCH_HEAD) GUIVERSION=$(shell cd ../../gui && git describe --tags $(git rev-list --tags --max-count=1) | sed 's/^v//') -VERSION=$(shell git describe --tags $(git rev-list --tags --max-count=1) | sed 's/^v//') +TOOLKITVERSION=$(shell git describe --tags $(git rev-list --tags --max-count=1) | sed 's/^v//') + +VERSION=${TOOLKITVERSION}-gui-${GUIVERSION} BASENAME=go-wit-gui @@ -21,9 +23,9 @@ clean: rm -rf DEBIAN extract: - mkdir -p ../files/usr/lib/go-gui - cp ../*.so ../files/usr/lib/go-gui/ - cp ../README.md ../files/usr/lib/go-gui/ + mkdir -p ../files/usr/lib/go-gui/${GUIVERSION}/${TOOLKITVERSION} + cp ../*.so ../files/usr/lib/go-gui/${GUIVERSION}/${TOOLKITVERSION}/ + cp ../README.md ../files/usr/lib/go-gui/${GUIVERSION}/${TOOLKITVERSION}/ # makes the DEBIAN/ directory DEBIAN: @@ -37,6 +39,7 @@ DEBIAN: mkdir -p DEBIAN cp control DEBIAN/ echo Version: ${VERSION} >>DEBIAN/control + echo ToolkitVersion: ${TOOLKITVERSION} >>DEBIAN/control echo GuiVersion: ${GUIVERSION} >>DEBIAN/control cp postinst DEBIAN