1
0
mirror of https://github.com/janet-lang/janet synced 2024-12-01 04:19:55 +00:00

For #240 - don't run ldconfig for DESTDIR installs.

This commit is contained in:
Calvin Rose 2020-03-03 18:03:44 -06:00
parent 8580d3c27e
commit 7c2c50ee16

View File

@ -41,7 +41,7 @@ CFLAGS:=$(CFLAGS) -std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fPIC -O2 -fvi
LDFLAGS:=$(LDFLAGS) -rdynamic LDFLAGS:=$(LDFLAGS) -rdynamic
# For installation # For installation
LDCONFIG:=ldconfig "$(DESTDIR)$(LIBDIR)" LDCONFIG:=ldconfig "$(LIBDIR)"
# Check OS # Check OS
UNAME:=$(shell uname -s) UNAME:=$(shell uname -s)
@ -262,7 +262,7 @@ install: $(JANET_TARGET) build/janet.pc
cp jpm.1 '$(DESTDIR)$(MANPATH)' cp jpm.1 '$(DESTDIR)$(MANPATH)'
mkdir -p '$(DESTDIR)$(PKG_CONFIG_PATH)' mkdir -p '$(DESTDIR)$(PKG_CONFIG_PATH)'
cp build/janet.pc '$(DESTDIR)$(PKG_CONFIG_PATH)/janet.pc' cp build/janet.pc '$(DESTDIR)$(PKG_CONFIG_PATH)/janet.pc'
-$(LDCONFIG) [ -z '$(DESTDIR)' ] && $(LDCONFIG) || true
uninstall: uninstall:
-rm '$(DESTDIR)$(BINDIR)/janet' -rm '$(DESTDIR)$(BINDIR)/janet'