...

diff --git a/helm/xsltd/Makefile.in b/helm/xsltd/Makefile.in
index 8f86273e19e0e9e79b0c7c2b49c75d7e62f468c4..5ddfce9681693b43f164a6fde90726e66b21c5f3 100644 (file)
--- a/helm/xsltd/Makefile.in
+++ b/helm/xsltd/Makefile.in
@@ -1,20 +1,9 @@
 HELM_LIB_DIR=@HELM_LIB_DIR@
-HELM_ETC_DIR=@HELM_ETC_DIR@
-HELM_LIBRARY_DIR=@HELM_LIBRARY_DIR@
-CONFIGURATION_DTD_DIR=@CONFIGURATION_DTD_DIR@
-CONFIGURATION_HELM_DIR=@CONFIGURATION_HELM_DIR@
+HELM_BIN_DIR=@HELM_BIN_DIR@
 
 install:
-       mkdir -p $(HELM_LIB_DIR)
-       mkdir -p $(HELM_ETC_DIR)
-       mkdir -p $(CONFIGURATION_HELM_DIR)
-       chmod 1777 $(CONFIGURATION_HELM_DIR)
-       mkdir -p $(CONFIGURATION_DTD_DIR)
-       cp lib/configuration.pl $(HELM_LIB_DIR)
-       cp etc/configuration.dtd etc/configuration.xml etc/helm-dictionary.xml \
-         etc/helm-font-configuration.xml etc/helm-math-engine-configuration.xml\
-         $(HELM_ETC_DIR)
-       cp library/servers.txt library/urls_of_uris.db $(HELM_LIBRARY_DIR)
+       cp xaland.class $HELM_LIB_DIR
+       cp start-xaland $HELM_BIN_DIR
 
 distclean:
        rm -f Makefile configure config.log config.cache config.status \

diff --git a/helm/xsltd/configure.in b/helm/xsltd/configure.in
index 29f38aa9a2f8642f2bbf8272e4e9546d906f6f06..b77304999799a3b94e00d0fde3d52f9a99765e8f 100644 (file)
--- a/helm/xsltd/configure.in
+++ b/helm/xsltd/configure.in
@@ -13,134 +13,33 @@ else
 fi
 
 dnl General
-AC_MSG_CHECKING("for the lib/helm dir")
-HELM_LIB_DIR=$RESOLVED_EXEC_PREFIX/lib/helm
-AC_MSG_RESULT($HELM_LIB_DIR)
-
-AC_MSG_CHECKING("for the etc/helm dir")
-HELM_ETC_DIR=$RESOLVED_PREFIX/etc/helm
-AC_MSG_RESULT($HELM_ETC_DIR)
+AC_MSG_CHECKING("for the bin dir")
+HELM_BIN_DIR=$RESOLVED_EXEC_PREFIX/bin
+AC_MSG_RESULT($HELM_BIN_DIR)
 
 AC_MSG_CHECKING("for the lib/helm dir")
-HELM_SHARE_DIR=$RESOLVED_PREFIX/share/helm
-AC_MSG_RESULT($HELM_SHARE_DIR)
-
-dnl Only for GtkMathview XML configuration
-HELM_DICTIONARY_PATH=$HELM_ETC_DIR/helm-dictionary.xml
-
-AC_CHECK_PROG(HAVE_GTKMATHVIEW_CONFIG,gtkmathview-config,yes,no)
-if test $HAVE_GTKMATHVIEW_CONFIG = no ; then
-   AC_MSG_ERROR(Could not find gtkmathview-config)
-fi
-GTKMATHVIEW_PREFIX=`gtkmathview-config --prefix`
-
-AC_MSG_CHECKING("for dictionary.xml")
-AC_CACHE_VAL(helm_cv_GTKMATHVIEW_DICTIONARY_PATH,
-   helm_cv_GTKMATHVIEW_DICTIONARY_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/dictionary.xml
-   if test ! -f $helm_cv_GTKMATHVIEW_DICTIONARY_PATH ; then
-      echo ""
-      AC_MSG_WARN(Could not find dictionary.xml. Where is it?)
-      read helm_cv_GTKMATHVIEW_DICTIONARY_PATH
-      RES="Asked"
-   fi
-)
-GTKMATHVIEW_DICTIONARY_PATH=$helm_cv_GTKMATHVIEW_DICTIONARY_PATH
-if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($GTKMATHVIEW_DICTIONARY_PATH)
-fi
-AC_CACHE_SAVE
-
-AC_MSG_CHECKING("for font-configuration.xml")
-RES=""
-AC_CACHE_VAL(helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH,
-   helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/font-configuration.xml
-   if test ! -f $helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH ; then
-      echo ""
-      AC_MSG_WARN(Could not find font-configuration.xml. Where is it?)
-      read helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH
-      RES="Asked"
-   fi
-)
-GTKMATHVIEW_FONT_CONFIGURATION_PATH=$helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH
-if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($GTKMATHVIEW_FONT_CONFIGURATION_PATH)
-fi
-AC_CACHE_SAVE
-
-AC_MSG_CHECKING("for t1.config")
-RES=""
-AC_CACHE_VAL(helm_cv_GTKMATHVIEW_T1_CONFIG_FILE,
-   helm_cv_GTKMATHVIEW_T1_CONFIG_FILE=$GTKMATHVIEW_PREFIX/share/gtkmathview/t1.config
-   if test ! -f $helm_cv_GTKMATHVIEW_T1_CONFIG_FILE ; then
-      echo ""
-      AC_MSG_WARN(Could not find t1.config. Where is it?)
-      read helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
-      RES="Asked"
-   fi
-)
-GTKMATHVIEW_T1_CONFIG_FILE=$helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
-if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($GTKMATHVIEW_T1_CONFIG_FILE)
-fi
-AC_CACHE_SAVE
-
-HELM_FONT_CONFIGURATION_PATH=$HELM_ETC_DIR/helm-font-configuration.xml
-
-dnl Only for HELM XML configuration
+HELM_LIB_DIR=$RESOLVED_PREFIX/lib/helm
+AC_MSG_RESULT($HELM_LIB_DIR)
 
-AC_MSG_CHECKING("for the library path")
+AC_MSG_CHECKING("for the stylesheets' dir")
 RES=""
-AC_CACHE_VAL(helm_cv_HELM_LIBRARY_DIR,
-  echo "Where should I put the downloaded library? Note: the \"library\" subdirectory and all the files and subdirectories recursively in it should be world writeable"
-  read helm_cv_HELM_LIBRARY_DIR
+AC_CACHE_VAL(helm_cv_HELM_STYLES_DIR,
+  echo "Where should I find the stylesheets? Note: your answer must be the path of the directory in which the stylesheets in the helm_data package have been installed."
+  read helm_cv_HELM_STYLES_DIR
   RES="Asked"
 )
-HELM_LIBRARY_DIR=$helm_cv_HELM_LIBRARY_DIR
+HELM_STYLES_DIR=$helm_cv_HELM_STYLES_DIR
 if test "$RES" != "Asked" ; then
-   HELM_LIBRARY_DIR=`eval "echo $HELM_LIBRARY_DIR"`
-   AC_MSG_RESULT($HELM_LIBRARY_DIR)
+   HELM_STYLES_DIR=`eval "echo $HELM_STYLES_DIR"`
+   AC_MSG_RESULT($HELM_STYLES_DIR)
 fi
 AC_CACHE_SAVE
 
-
-CONFIGURATION_HELM_DIR=$HELM_LIBRARY_DIR/library
-
-dnl CSC: ERROR: getters should download the DTDs
-CONFIGURATION_DTD_DIR=$HELM_SHARE_DIR/dtd
-
-CONFIGURATION_SERVERS_FILE=$HELM_LIBRARY_DIR/servers.txt
-CONFIGURATION_URIS_DBM=$HELM_LIBRARY_DIR/urls_of_uris
-
-AC_MSG_CHECKING("for the tmp dir")
-RES=""
-if test -d "/tmp" ; then
-   CONFIGURATION_TMPDIR=/tmp
-else
-   AC_MSG_WARN(Could not find /tmp. What directory could I use instead?)
-   read $CONFIGURATION_TMPDIR
-   RES="Asked"
-fi
-if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($CONFIGURATION_TMPDIR)
-fi
-
 AC_SUBST(HELM_LIB_DIR)
-AC_SUBST(HELM_ETC_DIR)
-AC_SUBST(HELM_LIBRARY_DIR)
-AC_SUBST(HELM_DICTIONARY_PATH)
-AC_SUBST(GTKMATHVIEW_DICTIONARY_PATH)
-AC_SUBST(HELM_FONT_CONFIGURATION_PATH)
-AC_SUBST(GTKMATHVIEW_FONT_CONFIGURATION_PATH)
-AC_SUBST(GTKMATHVIEW_T1_CONFIG_FILE)
-AC_SUBST(CONFIGURATION_HELM_DIR)
-AC_SUBST(CONFIGURATION_DTD_DIR)
-AC_SUBST(CONFIGURATION_SERVERS_FILE)
-AC_SUBST(CONFIGURATION_URIS_DBM)
-AC_SUBST(CONFIGURATION_TMPDIR)
+AC_SUBST(HELM_BIN_DIR)
+AC_SUBST(HELM_STYLES_DIR)
 
 AC_OUTPUT(
 [Makefile
- lib/configuration.pl
- etc/helm-math-engine-configuration.xml
- etc/configuration.xml
+ start-xaland
 ])

diff --git a/helm/xsltd/start-xaland.in b/helm/xsltd/start-xaland.in
index 4cf233adb34b29d673c3b0644215f6b1d3bc7b3c..2cad68d74ce04cd704e8a48c812adf86c2b49d1b 100755 (executable)
--- a/helm/xsltd/start-xaland.in
+++ b/helm/xsltd/start-xaland.in
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-export CLASS_DIR=.
-export HELM_STYLES_DIR=/usr/local/share/helm/style
+export CLASS_DIR=@HELM_LIB_DIR@
+export HELM_STYLES_DIR=@HELM_STYLES_DIR@
 export PATH=/opt/java/jdk1.3/bin/:$PATH
 export CLASSPATH=.
 export CLASSPATH=/projects/helm/shared/libraries/java/xalan_1_1/xalan.jar:$CLASSPATH