summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-10-26 11:07:31 +0000
committerJeroen Roovers <jer@gentoo.org>2014-10-26 11:07:31 +0000
commita2ee11c12bbad5c8e22d487786aaa04a074d01c6 (patch)
tree2b5f047609e48179127bc9dbe836f4d03bd51c8c
parentFix one format security warning. (diff)
downloadgentoo-2-a2ee11c12bbad5c8e22d487786aaa04a074d01c6.tar.gz
gentoo-2-a2ee11c12bbad5c8e22d487786aaa04a074d01c6.tar.bz2
gentoo-2-a2ee11c12bbad5c8e22d487786aaa04a074d01c6.zip
Fix bashism in Makefile.in (bug #526906).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
-rw-r--r--net-misc/lanmap/ChangeLog5
-rw-r--r--net-misc/lanmap/files/lanmap-81-make.patch9
2 files changed, 10 insertions, 4 deletions
diff --git a/net-misc/lanmap/ChangeLog b/net-misc/lanmap/ChangeLog
index d13444c51f72..52616ce5fac2 100644
--- a/net-misc/lanmap/ChangeLog
+++ b/net-misc/lanmap/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/lanmap
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lanmap/ChangeLog,v 1.9 2014/10/26 10:58:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lanmap/ChangeLog,v 1.10 2014/10/26 11:07:31 jer Exp $
+
+ 26 Oct 2014; Jeroen Roovers <jer@gentoo.org> files/lanmap-81-make.patch:
+ Fix bashism in Makefile.in (bug #526906).
*lanmap-81-r2 (26 Oct 2014)
diff --git a/net-misc/lanmap/files/lanmap-81-make.patch b/net-misc/lanmap/files/lanmap-81-make.patch
index b92d6f611f72..6ddae6c04533 100644
--- a/net-misc/lanmap/files/lanmap-81-make.patch
+++ b/net-misc/lanmap/files/lanmap-81-make.patch
@@ -1,7 +1,7 @@
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -2,8 +2,8 @@
- # $Id: lanmap-81-make.patch,v 1.1 2014/07/18 17:01:09 jer Exp $
+ # $Id: lanmap-81-make.patch,v 1.2 2014/10/26 11:07:31 jer Exp $
# complation
-CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
@@ -30,7 +30,7 @@
os_classify: os_classify.c misc.c
--- a/Makefile.in
+++ b/Makefile.in
-@@ -10,16 +10,16 @@
+@@ -10,18 +10,18 @@
DATADEST = ${prefix}/share/lanmap/
all:
@@ -48,8 +48,11 @@
- install -m 0644 -d $(DATADEST)graph
+ install -m 0755 -d $(DATADEST)graph
install -m 0644 ./graph/lanmap.header $(DATADEST)graph/
- for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f $(DATADEST)graph/img/; done
+- for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f $(DATADEST)graph/img/; done
++ for f in ./graph/img/*.gif ./graph/img/*.png ./graph/img/*.svg; do install -m 0644 $$f $(DATADEST)graph/img/; done
+ uninstall:
+ rm $(BINDEST)$(BINARY)
@@ -29,11 +29,11 @@
clean: