Changeset 2311 for trunk/examples/app-fermi

Timestamp:

Jul 11, 2011 9:09:18 AM (13 years ago)

Author:

gah

Message:

fix examples

Location:

trunk/examples/app-fermi

Files:

• Makefile.in (modified) (2 diffs)
• octave/Makefile.in (modified) (1 diff)
• octave/octave2 (moved) (moved from trunk/examples/app-fermi/octave/2)
• octave/octave3 (moved) (moved from trunk/examples/app-fermi/octave/3)

trunk/examples/app-fermi/Makefile.in

@@ -22 +22 @@
 PYTHON =        @PYTHON@
 MEX =           @MEX@
-OCTAVE =        @OCTAVE_VERSION@
-JAVA_HOME =     @JAVA_HOME@
+MKOCTFILE2 =    @MKOCTFILE2@
+MKOCTFILE3 =    @MKOCTFILE3@
+OCTAVE =        $(MKOCTFILE2) $(MKOCTFILE3)
+JAVAC =         @JAVAC@
 
 .PHONY: tcl cee fortran octave matlab perl python ruby java 2.0 wrapper
@@ -46 +48 @@
     LANGS += ruby
 endif
-ifneq ($(JAVA_HOME),)
+ifneq ($(JAVAC),)
     LANGS += java
 endif

trunk/examples/app-fermi/octave/Makefile.in

@@ -19 +19 @@
 SUBDIRS         = 
 ifneq ($(MKOCTFILE3),)
-  SUBDIRS += 3
+  SUBDIRS += octave3
 endif
 ifneq ($(MKOCTFILE2),)
-  SUBDIRS += 2
+  SUBDIRS += octave2
 endif