From 817d382fc59a78f6a39ab01b087b22d6ce906195 Mon Sep 17 00:00:00 2001 From: Keto Date: Sun, 2 Jul 2023 20:59:00 -0400 Subject: [PATCH 1/2] figlet: Fix manpage packaging --- makefiles/figlet.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/figlet.mk b/makefiles/figlet.mk index 162eef1b5a..2ba6e48b0e 100644 --- a/makefiles/figlet.mk +++ b/makefiles/figlet.mk @@ -10,6 +10,7 @@ figlet-setup: setup $(call DOWNLOAD_FILES,$(BUILD_SOURCE),ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-$(FIGLET_VERSION).tar.gz) $(call EXTRACT_TAR,figlet-$(FIGLET_VERSION).tar.gz,figlet-$(FIGLET_VERSION),figlet) sed -i '/#include /a #include ' $(BUILD_WORK)/figlet/figlet.c + sed -e "38s|man|share/man|" -e "s|prefix|PREFIX|g" -i $(BUILD_WORK)/figlet/Makefile ifneq ($(wildcard $(BUILD_WORK)/figlet/.build_complete),) figlet: @@ -17,13 +18,12 @@ figlet: else figlet: figlet-setup +$(MAKE) -C $(BUILD_WORK)/figlet \ - prefix="$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ LD="$(CC)" \ LDFLAGS="$(LDFLAGS)" +$(MAKE) -C $(BUILD_WORK)/figlet install \ - prefix="$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)" \ + PREFIX="$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)" \ DESTDIR="$(BUILD_STAGE)/figlet" $(call AFTER_BUILD) endif From 0ccb6734de13a534cfb2fffb8679e3949bad012a Mon Sep 17 00:00:00 2001 From: Keto Date: Sun, 2 Jul 2023 21:00:00 -0400 Subject: [PATCH 2/2] figlet: Bump version Signed-off-by: Keto --- makefiles/figlet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/figlet.mk b/makefiles/figlet.mk index 2ba6e48b0e..1cb5e46c87 100644 --- a/makefiles/figlet.mk +++ b/makefiles/figlet.mk @@ -4,7 +4,7 @@ endif SUBPROJECTS += figlet FIGLET_VERSION := 2.2.5 -DEB_FIGLET_V ?= $(FIGLET_VERSION) +DEB_FIGLET_V ?= $(FIGLET_VERSION)-1 figlet-setup: setup $(call DOWNLOAD_FILES,$(BUILD_SOURCE),ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-$(FIGLET_VERSION).tar.gz)