diff options
Diffstat (limited to 'sys-apps/noxcuse/files')
-rw-r--r-- | sys-apps/noxcuse/files/0001-Makefile-Fix-install-target-dependencies.patch | 25 | ||||
-rw-r--r-- | sys-apps/noxcuse/files/0002-Makefile-Support-DESTDIR.patch | 44 |
2 files changed, 69 insertions, 0 deletions
diff --git a/sys-apps/noxcuse/files/0001-Makefile-Fix-install-target-dependencies.patch b/sys-apps/noxcuse/files/0001-Makefile-Fix-install-target-dependencies.patch new file mode 100644 index 000000000..aaadad827 --- /dev/null +++ b/sys-apps/noxcuse/files/0001-Makefile-Fix-install-target-dependencies.patch @@ -0,0 +1,25 @@ +From bbb0e870e5234ed52138c22927bab9dba3c32d3c Mon Sep 17 00:00:00 2001 +From: Andrew Wilcox <AWilcox@Wilcox-Tech.com> +Date: Sat, 16 Apr 2016 15:03:12 -0500 +Subject: [PATCH 1/2] Makefile: Fix install target dependencies + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index e1ee228..638a354 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,7 @@ clean: + bin/%: src/%.c + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + +-install: $(patsubst bin/%,$(bindir)/%,$(B)) $(patsubst bin/%,$(usrbindir)/%,$(UB)) ++install: $(B:%=$(bindir)/%) $(UB:%=$(usrbindir)/%) + + size: $(ALL) + size -t $(ALL) +-- +2.7.4 + diff --git a/sys-apps/noxcuse/files/0002-Makefile-Support-DESTDIR.patch b/sys-apps/noxcuse/files/0002-Makefile-Support-DESTDIR.patch new file mode 100644 index 000000000..47fca9aa6 --- /dev/null +++ b/sys-apps/noxcuse/files/0002-Makefile-Support-DESTDIR.patch @@ -0,0 +1,44 @@ +From 29396c114765726c20ac6d1080433803f8f0dc86 Mon Sep 17 00:00:00 2001 +From: Andrew Wilcox <AWilcox@Wilcox-Tech.com> +Date: Sat, 16 Apr 2016 15:04:48 -0500 +Subject: [PATCH 2/2] Makefile: Support DESTDIR for out-of-root installations + +--- + Makefile | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 638a354..a4572ab 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + +-bindir = /bin +-usrbindir = /usr/bin ++bindir = $(DESTDIR)/bin ++usrbindir = $(DESTDIR)/usr/bin + + CFLAGS = -D_XOPEN_SOURCE=700 -Os -Wall -Wno-format -Wno-char-subscripts -Wno-unused -Wno-parentheses + LDFLAGS = +@@ -20,11 +20,17 @@ clean: + bin/%: src/%.c + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + +-install: $(B:%=$(bindir)/%) $(UB:%=$(usrbindir)/%) ++install: $(bindir) $(usrbindir) $(B:%=$(bindir)/%) $(UB:%=$(usrbindir)/%) + + size: $(ALL) + size -t $(ALL) + ++$(bindir): ++ mkdir -p $(bindir) ++ ++$(usrbindir): ++ mkdir -p $(usrbindir) ++ + $(bindir)/%: bin/% + install $< $(bindir) + +-- +2.7.4 + |