Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | |
| 3 | From: Mike Frysinger <vapier@gentoo.org> |
| 4 | Date: Sun, 13 May 2007 21:15:12 +0000 (-0400) |
| 5 | Subject: respect DESTDIR and dont use -s with install |
| 6 | X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=603c59b978c04df2354f68d4a2dc676a758ff46d |
| 7 | |
| 8 | respect DESTDIR and dont use -s with install |
| 9 | |
| 10 | $(DESTDIR) is the standard for installing into other trees, not $(BASEDIR) ... |
| 11 | so I've converted the Makefile to use that. I've also left in $(BASEDIR) as a |
| 12 | default to support old installs; not sure if you'd just cut it. |
| 13 | |
| 14 | Stripping should be left to the person to handle, not automatically done by |
| 15 | the install step. Also, `install -s` always calls `strip` which is |
| 16 | wrong/undesired in cross-compiling scenarios. |
| 17 | |
| 18 | Signed-off-by: Mike Frysinger <vapier@gentoo.org> |
| 19 | Signed-off-by: Neil Brown <neilb@suse.de> |
| 20 | --- |
| 21 | |
| 22 | diff --git a/Makefile b/Makefile |
| 23 | index 9e9a4b4..5343428 100644 |
| 24 | --- a/Makefile |
| 25 | +++ b/Makefile |
| 26 | @@ -135,13 +135,14 @@ from_local: CPPFLAGS += -DTEST |
| 27 | portmap.man : portmap.8 |
| 28 | sed $(MAN_SED) < portmap.8 > portmap.man |
| 29 | |
| 30 | +DESTDIR = $(BASEDIR) |
| 31 | install: all |
| 32 | - install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin |
| 33 | - install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin |
| 34 | - install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin |
| 35 | - install -o root -g root -m 0644 portmap.man ${BASEDIR}/usr/share/man/man8/portmap.8 |
| 36 | - install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8 |
| 37 | - install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8 |
| 38 | + install -o root -g root -m 0755 portmap $(DESTDIR)/sbin |
| 39 | + install -o root -g root -m 0755 pmap_dump $(DESTDIR)/sbin |
| 40 | + install -o root -g root -m 0755 pmap_set $(DESTDIR)/sbin |
| 41 | + install -o root -g root -m 0644 portmap.man $(DESTDIR)/usr/share/man/man8/portmap.8 |
| 42 | + install -o root -g root -m 0644 pmap_dump.8 $(DESTDIR)/usr/share/man/man8 |
| 43 | + install -o root -g root -m 0644 pmap_set.8 $(DESTDIR)/usr/share/man/man8 |
| 44 | |
| 45 | clean: |
| 46 | rm -f *.o portmap pmap_dump pmap_set from_local \ |