Various fixes.

diff --git a/Makefile.am b/Makefile.am
index 60a4fde..9216764 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.10 2003/11/29 23:38:37 mdw Exp $
+## $Id: Makefile.am,v 1.11 2003/11/30 00:58:21 mdw Exp $
 ##
 ## Makefile for Anag
 ##
@@ -28,6 +28,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.11  2003/11/30 00:58:21  mdw
+## Various fixes.
+##
 ## Revision 1.10  2003/11/29 23:38:37  mdw
 ## Debianization.
 ##
@@ -86,7 +89,7 @@ doszip: distdir
        rm -rf $(distdir)
 
 EXTRA_DIST = \
-       AnagGUI.java anag-gui.in \
+       AnagGUI.java anag-gui.in anag.manifest \
        debian/control debian/changelog debian/copyright debian/rules \
        debian/anag-gui-java.postinst debian/anag-gui-java.prerm \
        debian/anag-gui-tk.postinst debian/anag-gui-tk.prerm

diff --git a/configure.in b/configure.in
index a9dbcc5..11ffc8f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.4 2003/11/29 23:38:37 mdw Exp $
+dnl $Id: configure.in,v 1.5 2003/11/30 00:58:21 mdw Exp $
 dnl
 dnl Configuration script
 dnl
@@ -28,6 +28,9 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.5  2003/11/30 00:58:21  mdw
+dnl Various fixes.
+dnl
 dnl Revision 1.4  2003/11/29 23:38:37  mdw
 dnl Debianization.
 dnl
@@ -48,7 +51,7 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 mdw_GCC_FLAGS
 
-AC_CHECK_PROGS([JAVAC], [jikes javac], [none])
+AC_CHECK_PROGS([JAVAC], [javac jikes], [none])
 if test "$JAVAC" = "none"; then
   AC_MSG_WARN([No Java compiler found])
   JARFILES=""

diff --git a/debian/rules b/debian/rules
index 76191ab..d8a2e82 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ build:
        cd deb-build; ../configure \
                --prefix=/usr \
                --with-dictionary=/usr/share/dict/words
-       make -C deb-build JAVAC=jikes-kaffe
+       make -C deb-build 
        touch build
 
 clean: