--- ../xdvik/Makefile.in	Fri Sep  3 13:25:01 1999
+++ Makefile.in	Sat May  8 18:03:37 1999
@@ -1,4 +1,4 @@
-# Makefile for xdvik 
+# Makefile for oxdvik
 #
 # - 1999/05/08: janl: Removed submakes for libwww and kpathsea.  That's what
 #   the top makefile is for!
@@ -27,9 +27,9 @@
 LIBWWWDIR = ../../libs/libwww
 LIBWWWSRCDIR = $(srcdir)/../../libs/libwww
 
-# Extra xdvi-specific compiler options.
+# Extra oxdvi-specific compiler options.
 ps_def = @PS_DEF@
-prog_cflags = $(LIBWWWCPPFLAGS) $(ps_def) $(x_cppflags)
+prog_cflags = $(LIBWWWCPPFLAGS) $(ps_def) $(x_cppflags) -DOmega
 
 # We don't use alloca ourselves, but the X library might, and this way
 # we avoid buggy versions in -lPW or -lucb.
@@ -40,7 +40,7 @@
   sfDraw.o sfPath.o sfSelFile.o hypertex.o mime.o wwwfetch.o \
   $(ALLOCA)
 
-program = xdvi.bin
+program = oxdvi.bin
 programs = $(program)
 
 default all: $(programs) xdvi.1 
@@ -49,7 +49,7 @@
 	$(kpathsea_link) $(objects) $(x_link) $(LOADLIBES)
 
 squeeze: squeeze.o
-	$(link_command) squeeze.o $(LIBS) $(XLOADLIBES)
+	$(kpathsea_link) squeeze.o $(kpathsea) $(LIBS) $(XLOADLIBES)
 
 psheader.c: psheader.txt squeeze
 	./squeeze $(srcdir)/psheader.txt $@
@@ -64,7 +64,7 @@
 $(LIBWWWDIR)/libwww.a:
 	cd $(LIBWWWDIR); $(MAKE) $(makeargs) libwww.a
 
-# ac_include ../make/tkpathsea.mk
+ac_include ../make/tkpathsea.mk
 
 install: install-exec install-data
 uninstall: uninstall-exec uninstall-data
@@ -72,15 +72,12 @@
 install-exec: $(programs)
 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
 	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
-	$(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi
+	$(INSTALL_SCRIPT) $(srcdir)/oxdvi-sh $(scriptdir)/oxdvi
 uninstall-exec:
-	for p in $(programs) xdvi; do rm -f $(bindir)/$$p; done
+	for p in $(programs) oxdvi; do rm -f $(bindir)/$$p; done
 
-install-data: xdvi.1 
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) 
-	$(INSTALL_DATA) xdvi.1 $(mandir)/xdvi.$(manext)
+install-data:
 uninstall-data:
-	rm -f $(mandir)/xdvi.$(manext) 
 
 
 distname = xdvik
@@ -102,12 +99,12 @@
 clean::
 	rm -f *.flc
 
-# clean::
+#clean::
 #	test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) clean; } || true
 
 distclean::
 	rm -f psheader.c sedscript xdvi.1 *.flc
-# 	test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) distclean; } || true
+#	test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) distclean; } || true
 
 ac_include ../make/rdepend.mk
 ac_include depend.mk
