~sircmpwn/hare-dev

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
2 2

[PATCH hare] build: remove LOCALSRCDIR

Details
Message ID
<20220903164324.3254-1-apreiml@strohwolke.at>
DKIM signature
pass
Download raw message
Patch: +2 -3
As discussed in IRC the localsrcdir should not be part of install. 
It's also removed from the example config to avoid duplicate paths
in the hare build environment, if the config is used as a template.

Signed-off-by: Armin Preiml <apreiml@strohwolke.at>
---

 Makefile          | 2 +-
 config.example.mk | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index bdb2fd93..3b98057b 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ all: $(BINOUT)/hare $(BINOUT)/harec2 $(BINOUT)/haredoc

install: docs scripts/install-mods
	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 \
		$(DESTDIR)$(SRCDIR)/hare/stdlib $(DESTDIR)$(LOCALSRCDIR)
		$(DESTDIR)$(SRCDIR)/hare/stdlib
	install -m755 $(BINOUT)/hare $(DESTDIR)$(BINDIR)/hare
	install -m755 $(BINOUT)/haredoc $(DESTDIR)$(BINDIR)/haredoc
	install -m644 docs/hare.1 $(DESTDIR)$(MANDIR)/man1/hare.1
diff --git a/config.example.mk b/config.example.mk
index 36a90977..a296ce65 100644
--- a/config.example.mk
+++ b/config.example.mk
@@ -9,8 +9,7 @@ SRCDIR = $(PREFIX)/src
STDLIB = $(SRCDIR)/hare/stdlib

# Default HAREPATH
LOCALSRCDIR = /usr/local/src/hare
HAREPATH = $(LOCALSRCDIR)/stdlib:$(LOCALSRCDIR)/third-party:$(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party
HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party

## Build configuration

-- 
2.37.3

[hare/patches] build success

builds.sr.ht <builds@sr.ht>
Details
Message ID
<CMMX2A3U7TM3.35U0O5QD7I2QT@cirno2>
In-Reply-To
<20220903164324.3254-1-apreiml@strohwolke.at> (view parent)
DKIM signature
missing
Download raw message
hare/patches: SUCCESS in 1m29s

[build: remove LOCALSRCDIR][0] from [Armin Preiml][1]

[0]: https://lists.sr.ht/~sircmpwn/hare-dev/patches/35096
[1]: apreiml@strohwolke.at

✓ #837715 SUCCESS hare/patches/alpine.yml  https://builds.sr.ht/~sircmpwn/job/837715
✓ #837716 SUCCESS hare/patches/freebsd.yml https://builds.sr.ht/~sircmpwn/job/837716
Details
Message ID
<CN2TGKO8D25C.22M7P39J1NDW1@taiga>
In-Reply-To
<20220903164324.3254-1-apreiml@strohwolke.at> (view parent)
DKIM signature
pass
Download raw message
Thanks!

To git@git.sr.ht:~sircmpwn/hare
   27fd53f7..10cf8c9d  master -> master
Reply to thread Export thread (mbox)