| 1 |
diff --git a/cgi/cgi.c b/cgi/cgi.c |
| 2 |
index 5be9afe..5c8cf8d 100644 |
| 3 |
--- a/cgi/cgi.c |
| 4 |
+++ b/cgi/cgi.c |
| 5 |
@@ -503,7 +503,7 @@ static void _launch_debugger (CGI *cgi, char *display) |
| 6 |
|
| 7 |
if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL) |
| 8 |
{ |
| 9 |
- debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d"; |
| 10 |
+ debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d"; |
| 11 |
} |
| 12 |
|
| 13 |
if (!pid) |
| 14 |
diff --git a/configure b/configure |
| 15 |
index 8fc6a50..e49342e 100755 |
| 16 |
--- a/configure |
| 17 |
+++ b/configure |
| 18 |
@@ -6513,7 +6513,7 @@ if test $cs_cv_python = yes; then |
| 19 |
echo $ECHO_N "checking for python includes... $ECHO_C" >&6 |
| 20 |
python_inc=no |
| 21 |
python_lib=no |
| 22 |
- python_search_path="/neo/opt /usr/local /usr /c" |
| 23 |
+ python_search_path="/usr" |
| 24 |
python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15" |
| 25 |
if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then |
| 26 |
python_bin=$cs_cv_python_path |
| 27 |
@@ -6809,7 +6809,8 @@ echo "${ECHO_T}$_cur" >&6 |
| 28 |
done |
| 29 |
_ACJNI_FOLLOWED="$_cur" |
| 30 |
|
| 31 |
-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` |
| 32 |
+#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` |
| 33 |
+_JTOPDIR="$java_path" |
| 34 |
case "$host_os" in |
| 35 |
darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` |
| 36 |
_JINC="$_JTOPDIR/Headers";; |
| 37 |
diff --git a/imd/imdm.py b/imd/imdm.py |
| 38 |
index 442c1ee..c23f590 100755 |
| 39 |
--- a/imd/imdm.py |
| 40 |
+++ b/imd/imdm.py |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-#!/usr/local/bin/python |
| 43 |
+#!/usr/bin/python |
| 44 |
# |
| 45 |
# imdm |
| 46 |
# |
| 47 |
diff --git a/java-jni/Makefile b/java-jni/Makefile |
| 48 |
index 390bdf5..f6edba5 100644 |
| 49 |
--- a/java-jni/Makefile |
| 50 |
+++ b/java-jni/Makefile |
| 51 |
@@ -40,14 +40,14 @@ org_clearsilver_HDF.h: $(NEO_UTIL_JAVA_JAR) |
| 52 |
org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR) |
| 53 |
$(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS |
| 54 |
|
| 55 |
-CSTest.class: CSTest.java |
| 56 |
+CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR) |
| 57 |
$(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java |
| 58 |
|
| 59 |
gold: CSTest.class |
| 60 |
@/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold |
| 61 |
@echo "Generated gold files" |
| 62 |
|
| 63 |
-test: CSTest.class |
| 64 |
+test: CSTest.class $(NEO_UTIL_SO) |
| 65 |
@echo "Running java test" |
| 66 |
@failed=0; \ |
| 67 |
rm -f javatest.out; \ |
| 68 |
diff --git a/ruby/Makefile b/ruby/Makefile |
| 69 |
index a8a82bf..02cf557 100644 |
| 70 |
--- a/ruby/Makefile |
| 71 |
+++ b/ruby/Makefile |
| 72 |
@@ -41,7 +41,7 @@ testrb: ext/hdf/hdf.so |
| 73 |
|
| 74 |
|
| 75 |
install: all |
| 76 |
- $(RUBY) install.rb install |
| 77 |
+ $(RUBY) install.rb install --prefix=$(DESTDIR) |
| 78 |
|
| 79 |
clean: |
| 80 |
$(RM) ext/hdf/*.o ext/hdf/*.so |
Parent Directory
| 
Revision Log
| 
Revision Graph
