summaryrefslogtreecommitdiff
path: root/devel/ice/files/patch-cpp-Makefile
diff options
context:
space:
mode:
authorMichael Gmelin <grembo@FreeBSD.org>2015-07-13 19:48:31 +0000
committerMichael Gmelin <grembo@FreeBSD.org>2015-07-13 19:48:31 +0000
commit4aff7c172aea9ed50e57dd8d72b07f14e933eea3 (patch)
tree44b0b251b0efbeb4b43e52a52af7aaa13732a930 /devel/ice/files/patch-cpp-Makefile
parent- Drop @dirrm* from plist (diff)
Update devel/ice, devel/py-ice and devel/php5-ice to 3.6.0
PR: 201143 Differential Revision: https://reviews.freebsd.org/D2930 Reviewed by: bapt Approved by: bapt Tested by: Roger Leigh <rleigh@codelibre.net>
Notes
Notes: svn path=/head/; revision=391942
Diffstat (limited to 'devel/ice/files/patch-cpp-Makefile')
-rw-r--r--devel/ice/files/patch-cpp-Makefile29
1 files changed, 8 insertions, 21 deletions
diff --git a/devel/ice/files/patch-cpp-Makefile b/devel/ice/files/patch-cpp-Makefile
index 4857584e8327..d361a1d8898d 100644
--- a/devel/ice/files/patch-cpp-Makefile
+++ b/devel/ice/files/patch-cpp-Makefile
@@ -1,26 +1,13 @@
---- cpp.orig/Makefile 2013-03-11 15:19:46.000000000 +0000
-+++ cpp/Makefile 2013-05-19 22:06:57.713280491 +0000
-@@ -11,11 +11,22 @@
+--- cpp/Makefile.orig 2015-06-23 15:30:20.000000000 +0000
++++ cpp/Makefile 2015-06-27 09:35:22.892599446 +0000
+@@ -13,8 +13,8 @@
- include $(top_srcdir)/config/Make.rules
+ SUBDIRS = config src include
--SUBDIRS = config src include test
-+SUBDIRS = config src include
-+
+-ifneq ($(MAKECMDGOALS),install)
+- SUBDIRS := $(SUBDIRS) test
+ifeq ($(NOTESTS),)
-+SUBDIRS := $(SUBDIRS) test
-+endif
-
- ifeq ($(shell uname | grep MINGW),)
-+ifeq ($(NODEMOS),)
- SUBDIRS := $(SUBDIRS) demo
++ SUBDIRS := $(SUBDIRS) test
endif
-+endif
-+
-+ifeq ($(NOICEDOCS),)
-+SUBDIRS := $(SUBDIRS) doc
-+endif
-+
-
- INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
+ INSTALL_SUBDIRS = $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \