From f2915a1b0675b4e28a7b614e6503208c5f9097c7 Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Fri, 26 Jan 2024 16:26:25 -0400
Subject: [PATCH] Amend makefile install

---
 cross/fengoffice/Makefile | 10 +++++++---
 spk/fengoffice/Makefile   |  2 --
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cross/fengoffice/Makefile b/cross/fengoffice/Makefile
index 6c66ba2d5381..d4ed00cc644d 100644
--- a/cross/fengoffice/Makefile
+++ b/cross/fengoffice/Makefile
@@ -10,10 +10,14 @@ HOMEPAGE = https://www.fengoffice.com
 COMMENT  = Feng Office is a Collaboration Platform and Project Management System.
 LICENSE  = AGPL
 
-POST_INSTALL_TARGET = fengoffice_post_install
+CONFIGURE_TARGET = nop
+COMPILE_TARGET = nop
+INSTALL_TARGET = fengoffice_install
 
 include ../../mk/spksrc.cross-cc.mk
 
-.PHONY: fengoffice_post_install
-fengoffice_post_install:
+.PHONY: fengoffice_install
+fengoffice_install:
+	mkdir -p $(STAGING_INSTALL_PREFIX)/share/fengoffice
+	tar -cf - -C $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/fengoffice
 	install -m 644 src/install_helper.php $(STAGING_INSTALL_PREFIX)/share/fengoffice/public/install/install_helper.php
diff --git a/spk/fengoffice/Makefile b/spk/fengoffice/Makefile
index 0467d6c554f2..d4af1fcd8505 100644
--- a/spk/fengoffice/Makefile
+++ b/spk/fengoffice/Makefile
@@ -45,7 +45,5 @@ include ../../mk/spksrc.spk.mk
 
 .PHONY: fengoffice_extra_install
 fengoffice_extra_install: 
-	install -m 755 -d $(STAGING_DIR)/var
-	install -m 755 src/fengoffice.sh $(STAGING_DIR)/bin/
 	install -m 755 -d $(STAGING_DIR)/app
 	install -m 644 src/app/config $(STAGING_DIR)/app/config