Updated to match extensions/configure.

src/makeBaseExt/top/configure/CONFIG

@@ -1,5 +1,9 @@
 # $Revision-Id$
 
+# You might want to change this to some shared set of rules, e.g.
+# RULES=/path/to/epics/support/modules/rules/x-y
+RULES=$(EPICS_BASE)
+
 INSTALL_IDLFILE = $(INSTALL)
 
 include $(TOP)/configure/RELEASE
@@ -10,7 +14,7 @@ ifdef T_A
 -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
-CONFIG=$(EPICS_BASE)/configure
+CONFIG=$(RULES)/configure
 include $(CONFIG)/CONFIG
 
 # Override for definition in base

src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-x86

@@ -31,7 +31,8 @@ TK_TCL = /usr/lib
 IDL =
 
 #JAVA_DIR=/usr/local/java
-JAVA_DIR=/usr/java/j2sdk1.4.1
+#JAVA_DIR=/usr/java/j2sdk1.4.1
+JAVA_DIR=/usr
 JAVA_INC=$(JAVA_DIR)/include
 
 INTERVIEWS_BIN=/usr/local/interviews/bin/O.Linux

src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64

@@ -30,7 +30,7 @@ JAVA_DIR=/usr
 # Sciplot and XRTgraph used by medm
 SCIPLOT=YES
 #XRTGRAPH_EXTENSIONS = YES
-#XRTGRAPH = /usr/local/xrtgraph
+#XRTGRAPH = /usr/local/xrtgraph64
 XRTGRAPH_EXTENSIONS =
 XRTGRAPH =
 

src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc

@@ -38,10 +38,13 @@ IV_LIB=/usr/local/interviews/lib/O.solaris
 WINGZ_INC = /opt/local/Wingz2/incl
 WINGZ_LIB = /opt/local/Wingz2/lib
 #MATHEMATICA = /usr/local/math
+
 # Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
 #   and you want the extensions for MEDM
-XRTGRAPH_EXTENSIONS = YES
-XRTGRAPH = /opt/local/xrtgraph
+#XRTGRAPH_EXTENSIONS = YES
+#XRTGRAPH = /opt/local/xrtgraph
+SCIPLOT = YES
+
 QUESTWIN = /usr/local/questwin
 
 TK_LIB = /opt/local/lib

src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu

@@ -10,5 +10,5 @@
 #       leave the line empty.
 #
 
--include $(TOP)/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
+-include $(TOP)/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64
 

src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64

@@ -18,3 +18,9 @@ ATLAS_LIB = /usr/local/oag/3rdParty/ATLAS/SunOS_SunUSIII_4/lib
 F2C_LIB = /usr/local/oag/3rdParty/F2C/SunOS_SunUSIII_4/lib
 CLAPACK_INCLUDE = /usr/local/oag/3rdParty/CLAPACK/SunOS_SunUSIII_4/include
 ATLAS_INCLUDE = /usr/local/oag/3rdParty/ATLAS/SunOS_SunUSIII_4/include
+
+# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
+#   and you want the extensions for MEDM
+#XRTGRAPH_EXTENSIONS =
+#XRTGRAPH =
+SCIPLOT = YES

src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86

@@ -86,9 +86,9 @@ QUESTWIN =
 # Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
 #   and you want the extensions for MEDM
 XRTGRAPH_EXTENSIONS = NO
-XRTGRAPH =
-# Define SCIPLOT if you don't have XRT/graph
-#SCIPLOT = YES
+#XRTGRAPH =
+
+SCIPLOT = YES
 
 # z library created in SDDS extension
 ZLIB_CFLAG = -DzLib
@@ -98,8 +98,7 @@ z_DIR = $(EPICS_EXTENSIONS_LIB)
 CLAPACK_INCLUDE = c:/CLAPACK/include
 CLAPACK_LIB = c:/CLAPACK/lib
 
-
-EXCEED = Exceed7.10
+EXCEED = Exceed13.0
 
 ifeq ($(EXCEED),Exceed5)
   X11_LIB = c:/exceed5/xdk/lib
@@ -191,6 +190,18 @@ ifeq ($(EXCEED),Exceed12.0)
   HCLXmu_DIR=$(X11_LIB)
   EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP
 endif
+ifeq ($(EXCEED),Exceed13.0)
+  XDK=C:/Exceed13.0/XDK
+  X11_LIB = $(XDK)/lib
+  X11_INC = $(XDK)/include
+  EXCEED_XLIBS=XmStatic XmStatXt Xlib HCLXmu
+  XmStatic_DIR=$(X11_LIB)
+  XmStatXt_DIR=$(X11_LIB)
+  Xlib_DIR=$(X11_LIB)
+  HCLXmu_DIR=$(X11_LIB)
+  EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP
+endif
+
 
 ######################################################
 # Override for XFree86/LessTif