forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-15 03:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

DESTDIR always transformed to absolute R_DESTDIR

Browse Source
This commit is contained in:
Maxim Devaev
2024-03-22 12:58:53 +02:00
parent ac88996a8c
commit 0ab8e0d05e
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -9,6 +9,8 @@ PY ?= python3
CFLAGS ?= -O3 CFLAGS ?= -O3
LDFLAGS ?= LDFLAGS ?=
R_DESTDIR = $(if $(DESTDIR),$(shell realpath "$(DESTDIR)"),)
export export
_LINTERS_IMAGE ?= ustreamer-linters _LINTERS_IMAGE ?= ustreamer-linters
@@ -59,10 +61,10 @@ endif
ifneq ($(call optbool,$(WITH_JANUS)),) ifneq ($(call optbool,$(WITH_JANUS)),)
$(MAKE) -C janus install $(MAKE) -C janus install
endif endif
mkdir -p $(DESTDIR)$(MANPREFIX)/man1 mkdir -p $(R_DESTDIR)$(MANPREFIX)/man1
for man in $(shell ls man); do \ for man in $(shell ls man); do \
install -m644 man/$$man $(DESTDIR)$(MANPREFIX)/man1/$$man; \ install -m644 man/$$man $(R_DESTDIR)$(MANPREFIX)/man1/$$man; \
gzip -f $(DESTDIR)$(MANPREFIX)/man1/$$man; \ gzip -f $(R_DESTDIR)$(MANPREFIX)/man1/$$man; \
done done

6
janus/Makefile
View File

@@ -1,4 +1,4 @@
DESTDIR ?= R_DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
CC ?= gcc CC ?= gcc
@@ -42,8 +42,8 @@ $(_BUILD)/%.o: %.c
install: $(_PLUGIN) install: $(_PLUGIN)
mkdir -p $(DESTDIR)$(PREFIX)/lib/ustreamer/janus mkdir -p $(R_DESTDIR)$(PREFIX)/lib/ustreamer/janus
install -m755 $(_PLUGIN) $(DESTDIR)$(PREFIX)/lib/ustreamer/janus/$(PLUGIN) install -m755 $(_PLUGIN) $(R_DESTDIR)$(PREFIX)/lib/ustreamer/janus/$(PLUGIN)
clean: clean:

4
python/Makefile
View File

@@ -1,6 +1,6 @@
-include ../config.mk -include ../config.mk
DESTDIR ?= R_DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
PY ?= python3 PY ?= python3
@@ -13,7 +13,7 @@ all:
install: install:
$(PY) setup.py install --prefix=$(PREFIX) --root=$(if $(DESTDIR),$(DESTDIR),/) $(PY) setup.py install --prefix=$(PREFIX) --root=$(if $(R_DESTDIR),$(R_DESTDIR),/)
clean: clean:

10
src/Makefile
View File

@@ -1,4 +1,4 @@
DESTDIR ?= R_DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
CC ?= gcc CC ?= gcc
@@ -94,14 +94,16 @@ all: $(_TARGETS)
install: all install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin mkdir -p $(R_DESTDIR)$(PREFIX)/bin
for i in $(subst .bin,,$(_TARGETS)); do \ for i in $(subst .bin,,$(_TARGETS)); do \
install -m755 $$i.bin $(DESTDIR)$(PREFIX)/bin/$$i; \ install -m755 $$i.bin $(R_DESTDIR)$(PREFIX)/bin/$$i; \
done done
install-strip: install install-strip: install
for i in $(subst .bin,,$(_TARGETS)); do strip $(DESTDIR)$(PREFIX)/bin/$$i; done for i in $(subst .bin,,$(_TARGETS)); do \
strip $(R_DESTDIR)$(PREFIX)/bin/$$i; \
done
$(_USTR): $(_USTR_SRCS:%.c=$(_BUILD)/%.o) $(_USTR): $(_USTR_SRCS:%.c=$(_BUILD)/%.o)