projects / packages / bchunk.git / blame
| Commit | Line | Data |
|---|---|---|
| ecafdc58 JP |
1 | From 5423c2ad6839976308e3e90f89697107b9bf29f7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dan Church <amphetamachine@gmail.com> | |
| 3 | Date: Wed, 26 Feb 2020 10:12:07 -0600 | |
| 4 | Subject: [PATCH] Allow installation into build jail | |
| 5 | ||
| 6 | Don't chown files when installing, as that's a root-only op. Uses the | |
| 7 | standard DESTDIR variable used all over by makefiles generated by | |
| 8 | autotools. | |
| 9 | --- | |
| 10 | Makefile | 9 +++++++-- | |
| 11 | 1 file changed, 7 insertions(+), 2 deletions(-) | |
| 12 | ||
| 13 | diff --git a/Makefile b/Makefile | |
| 14 | index 1124a21..49928d2 100644 | |
| 15 | --- a/Makefile | |
| 16 | +++ b/Makefile | |
| 17 | @@ -12,6 +12,9 @@ CFLAGS = -Wall -Wstrict-prototypes -O2 | |
| 18 | ||
| 19 | # For BSD install: Which install to use and where to put the files | |
| 20 | INSTALL = install | |
| 21 | +INSTALL_DIR = $(INSTALL) -d -m 0755 | |
| 22 | +INSTALL_DATA = $(INSTALL) -m 0644 | |
| 23 | +INSTALL_EXEC = $(INSTALL) -m 0755 | |
| 24 | PREFIX = /usr/local | |
| 25 | BIN_DIR = $(PREFIX)/bin | |
| 26 | MAN_DIR = $(PREFIX)/man | |
| 27 | @@ -26,9 +29,11 @@ distclean: clean | |
| 28 | ||
| 29 | install: installbin installman | |
| 30 | installbin: | |
| 31 | - $(INSTALL) -m 755 -s -o root -g root bchunk $(BIN_DIR) | |
| 32 | + $(INSTALL_DIR) $(DESTDIR)$(BIN_DIR) | |
| 33 | + $(INSTALL_EXEC) -s bchunk $(DESTDIR)$(BIN_DIR) | |
| 34 | installman: | |
| 35 | - $(INSTALL) -m 644 -o bin -g bin bchunk.1 $(MAN_DIR)/man1 | |
| 36 | + $(INSTALL_DIR) $(DESTDIR)$(MAN_DIR)/man1 | |
| 37 | + $(INSTALL_DATA) bchunk.1 $(DESTDIR)$(MAN_DIR)/man1 | |
| 38 | ||
| 39 | BITS = bchunk.o | |
| 40 |