From 6739d6ac8e968efddaa491e9d24d9b6804f3577a Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 20 Jul 2025 09:43:33 -0300 Subject: Makefile: Update installation directory to be compatible with node --- .gitignore | 2 +- Makefile | 13 +++++++------ package.json | 3 +++ 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 package.json diff --git a/.gitignore b/.gitignore index bf8600d..6520faf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/node_modules/ +/node_modules /src/*.exported.mjs diff --git a/Makefile b/Makefile index e91c876..c7da16d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ NAME_UC = $(NAME) PREFIX = /usr BINDIR = $(PREFIX)/bin LIBDIR = $(PREFIX)/lib -JSLIBDIR = $(LIBDIR)/javascript +JSLIBDIR = $(LIBDIR)/node/$(NAME) INCLUDEDIR = $(PREFIX)/include SRCDIR = $(PREFIX)/src/$(NAME) SHAREDIR = $(PREFIX)/share @@ -30,7 +30,7 @@ all: include deps.mk sources = \ - src/$(NAME).mjs \ + src/$(NAME).mjs \ derived-assets = \ @@ -85,11 +85,12 @@ clean: ## ensures that all installable artifacts are crafted beforehand. install: all mkdir -p \ - '$(DESTDIR)$(BINDIR)' \ - '$(DESTDIR)$(JSLIBDIR)' \ + '$(DESTDIR)$(BINDIR)' \ + '$(DESTDIR)$(JSLIBDIR)'/src \ '$(DESTDIR)$(SRCDIR)' \ - cp src/$(NAME).mjs '$(DESTDIR)$(JSLIBDIR)' + cp src/$(NAME).mjs '$(DESTDIR)$(JSLIBDIR)'/src + cp package.json '$(DESTDIR)$(JSLIBDIR)' cp $(sources) '$(DESTDIR)$(SRCDIR)' ## Uninstalls from $(DESTDIR)$(PREFIX). This is a perfect mirror @@ -97,7 +98,7 @@ install: all ## A dedicated test asserts that this is always true. uninstall: rm -rf \ - '$(DESTDIR)$(JSLIBDIR)'/$(NAME).mjs \ + '$(DESTDIR)$(JSLIBDIR)' \ '$(DESTDIR)$(SRCDIR)' \ diff --git a/package.json b/package.json new file mode 100644 index 0000000..7f0f12b --- /dev/null +++ b/package.json @@ -0,0 +1,3 @@ +{ + "main": "src/sjs.mjs" +} -- cgit v1.2.3