zeroc-ice (3.3.1-12) 10-importkey-path.patch

Summary

 cpp/src/ca/Makefile |    6 +++---
 cpp/src/ca/iceca    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

    
download this patch

Patch contents

diff -Nur -x '*.orig' -x '*~' zeroc-ice/cpp/src/ca/iceca zeroc-ice.new/cpp/src/ca/iceca
--- zeroc-ice/cpp/src/ca/iceca	2009-03-27 09:14:00.882324870 +0100
+++ zeroc-ice.new/cpp/src/ca/iceca	2009-03-27 10:04:58.727682136 +0100
@@ -109,7 +109,7 @@
         # script ../lib). For development purposes we also check ".".
         #
         checkLocations = [".", os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")),
-                          "/usr/share/Ice-3.3.1"]
+                          "/usr/share/java"]
         for bindir in checkLocations:
             bindir = os.path.normpath(bindir)
             if os.path.exists(os.path.join(bindir, "ImportKey.class")):
diff -Nur -x '*.orig' -x '*~' zeroc-ice/cpp/src/ca/Makefile zeroc-ice.new/cpp/src/ca/Makefile
--- zeroc-ice/cpp/src/ca/Makefile	2009-03-27 09:14:00.882324870 +0100
+++ zeroc-ice.new/cpp/src/ca/Makefile	2009-03-27 10:03:59.246335439 +0100
@@ -25,7 +25,7 @@
 	cp ImportKey.class $@
 
 install::
-	@for subdir in $(prefix)/bin $(prefix)/lib; \
+	@for subdir in $(prefix)/bin $(prefix)/share/java; \
 	do \
 	    if test ! -d $$subdir ; \
 	    then \
@@ -43,6 +43,6 @@
 	@for i in $(CLASS_FILES) ; \
 	do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_PROGRAM) $$i $(prefix)/lib ;\
-	    chmod a+x $(prefix)/lib/$$i ;\
+	    $(INSTALL_PROGRAM) $$i $(prefix)/share/java ;\
+	    chmod a+x $(prefix)/share/java/$$i ;\
 	done