commit b89a447af7a075857bfc4e6011d7a35bb3a7e3ad
parent c7dcfb5cd6c454ba58bf8d8d053a5e5d362c67e5
Author: Armin Preiml <apreiml@strohwolke.at>
Date: Sat, 3 Sep 2022 18:43:24 +0200
build: remove LOCALSRCDIR
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>
Diffstat:
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git 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
@@ -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