- updated dont-build patch

diff --git a/dont-build-demo-test.patch b/dont-build-demo-test.patch
index 3b675100c8da189842894a4f423e07592020a445..873b4e7684e909c239ecd98bc43ea517a7d5d2d1 100644 (file)
--- a/dont-build-demo-test.patch
+++ b/dont-build-demo-test.patch
@@ -1,19 +1,22 @@
-Don't build the demo or test directories
-diff -ur Ice-3.3.0.orig/cpp/Makefile Ice-3.3.0/cpp/Makefile
---- Ice-3.3.0.orig/cpp/Makefile        2008-05-16 18:24:00.000000000 +0100
-+++ Ice-3.3.0/cpp/Makefile     2008-05-21 11:18:17.000000000 +0100
-@@ -11,7 +11,7 @@
+diff -ur Ice-3.5.1-orig/cpp/Makefile Ice-3.5.1/cpp/Makefile
+--- Ice-3.5.1-orig/cpp/Makefile        2013-10-07 14:19:37.712388988 +0100
++++ Ice-3.5.1/cpp/Makefile     2013-10-07 14:20:08.704323464 +0100
+@@ -11,11 +11,7 @@
  
  include $(top_srcdir)/config/Make.rules
  
 -SUBDIRS               = config src include test
+-
+-ifeq ($(shell uname | grep MINGW),)
+-SUBDIRS               := $(SUBDIRS) demo
+-endif
 +SUBDIRS               = config src include
  
- ifeq ($(shell uname | grep MINGW),)
- SUBDIRS               := $(SUBDIRS) demo
-diff -ur Ice-3.3.0.orig/cs/Makefile Ice-3.3.0/cs/Makefile
---- Ice-3.3.0.orig/cs/Makefile 2008-05-16 18:24:01.000000000 +0100
-+++ Ice-3.3.0/cs/Makefile      2008-05-21 11:18:22.000000000 +0100
+ INSTALL_SUBDIRS       = $(install_bindir) $(install_libdir) $(install_includedir) \
+       $(install_configdir) $(install_mandir)
+diff -ur Ice-3.5.1-orig/cs/Makefile Ice-3.5.1/cs/Makefile
+--- Ice-3.5.1-orig/cs/Makefile 2013-10-07 14:19:37.756388895 +0100
++++ Ice-3.5.1/cs/Makefile      2013-10-07 14:20:23.200292801 +0100
 @@ -11,7 +11,7 @@
  
  include $(top_srcdir)/config/Make.rules.cs
@@ -21,5 +24,17 @@ diff -ur Ice-3.3.0.orig/cs/Makefile Ice-3.3.0/cs/Makefile
 -SUBDIRS               = src test demo
 +SUBDIRS               = src
  
- install:: install-common
-       @if test ! -d $(install_bindir) ; \
+ INSTALL_SUBDIRS       = $(install_bindir) $(install_assembliesdir) $(install_mandir)
+ 
+diff -ur Ice-3.5.1-orig/java/Makefile Ice-3.5.1/java/Makefile
+--- Ice-3.5.1-orig/java/Makefile       2013-10-07 14:19:37.619389185 +0100
++++ Ice-3.5.1/java/Makefile    2013-10-07 14:20:47.896240537 +0100
+@@ -24,7 +24,7 @@
+ endif
+ 
+ all:
+-      ant $(ANT_FLAGS)
++      ant $(ANT_FLAGS) dist-jar
+ 
+ clean:
+       ant $(ANT_FLAGS) clean