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