From 2a3a110dac53b271caf9aa97776cf95efecc83bc Mon Sep 17 00:00:00 2001 From: Mehmet Samet Duman Date: Fri, 3 Apr 2026 18:38:20 +0300 Subject: NOISSUE add some contrib files and fixes sh Signed-off-by: Mehmet Samet Duman --- corebinutils/sh/GNUmakefile | 12 ++++++------ corebinutils/sh/testcmd.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'corebinutils/sh') diff --git a/corebinutils/sh/GNUmakefile b/corebinutils/sh/GNUmakefile index a72eb1d61e..60e61a0846 100644 --- a/corebinutils/sh/GNUmakefile +++ b/corebinutils/sh/GNUmakefile @@ -8,7 +8,7 @@ CC ?= cc AWK ?= awk CPPFLAGS += -D_GNU_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 \ -I"$(CURDIR)" -I"$(CURDIR)/build/gen" -I"$(CURDIR)/../kill" \ - -I"$(CURDIR)/../../usr.bin/printf" -I"$(CURDIR)/../../bin/test" + -I"$(CURDIR)/../contrib/printf" -I"$(CURDIR)/../test" CFLAGS ?= -O2 CFLAGS += -g -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare LDFLAGS ?= @@ -22,13 +22,13 @@ GENDIR := $(CURDIR)/build/gen OUTDIR := $(CURDIR)/out TARGET := $(OUTDIR)/sh TEST_RUNNER := $(TOOLDIR)/run-default-sigpipe -LIBEDITDIR := $(CURDIR)/../../contrib/libedit -LIBEDIT_GENDIR := $(GENDIR)/libedit -VISDIR := $(CURDIR)/../../contrib/libc-vis +LIBEDITDIR := $(CURDIR)/../contrib/libedit +LIBEDIT_GENDIR := $(GENDIR)/../contrib/libedit +VISDIR := $(CURDIR)/../contrib/libc-vis KILLDIR := $(CURDIR)/../kill -TESTDIR := $(CURDIR)/../../bin/test -PRINTFDIR := $(CURDIR)/../../usr.bin/printf +TESTDIR := $(CURDIR)/../test +PRINTFDIR := $(CURDIR)/../contrib/printf CPPFLAGS += -I"$(LIBEDIT_GENDIR)" -I"$(LIBEDITDIR)" LIBEDIT_CPPFLAGS := $(CPPFLAGS) $(EDITLINE_CPPFLAGS) -include "$(CURDIR)/compat.h" -I"$(VISDIR)" diff --git a/corebinutils/sh/testcmd.c b/corebinutils/sh/testcmd.c index d82d3c9e45..b8b8e7a4ee 100644 --- a/corebinutils/sh/testcmd.c +++ b/corebinutils/sh/testcmd.c @@ -21,7 +21,7 @@ testcmd_exit(int status) #define exit testcmd_exit #define main testcmd_main -#include "../../bin/test/test.c" +#include "../test/test.c" #undef main #undef exit -- cgit 0.0.5-2-1-g0f52