--- Makefile.orig	Fri Feb 14 11:58:11 1997
+++ Makefile	Sun Nov 23 13:48:36 1997
@@ -8,10 +8,10 @@
 #=========================================================================
 VERSION = 0.4
 PATCHLEVEL = 7
-TETEXDIR=/usr/local/teTeX
+TETEXDIR=$(PREFIX)
 # the following should be best for a pentium
 # -O2 -s -m486 -malign-jumps=2 -malign-loops=2 -malign-functions=2
-CFLAGS	= -O2
+CFLAGS	:= $(CFLAGS) -pipe -DHAVE_EXTERN_SYS_ERRLIST=1
 
 # For "real" 64bit OS, e.g. Digital Unix 4.0. Irix6?, use:
 # CFLAGS += -DPOINTER_IS_NOT_INT
@@ -21,7 +21,7 @@
 
 # -s makes problems on some platforms. We run strip after "make install",
 # so we really do not need -s here.
-LDFLAGS	=
+LDFLAGS	= -s
 
 # The shared libXmu from OpenWindows is buggy on some SunOS 4.1.3 systems.
 # If you run into this problem (when linking xdvi), set BROKEN_SUNOS_LIBXMU
@@ -70,24 +70,24 @@
 # set USE_DIALOG=false if compiling dialog causes trouble on your system
 # texconfig will still run in command-mode
 #=========================================================================
-override USE_DIALOG=true
+USE_DIALOG=false
 
 #=========================================================================
 # set USE_NCURSES=false if you want to use your system curses instead of
 # the ncurses library.
 #=========================================================================
-override USE_NCURSES=true
+USE_NCURSES=false
 
 #=========================================================================
 # set HAVE_NCURSES=true if you want to use an already installed version of
 # the ncurses library.
 #=========================================================================
-override HAVE_NCURSES=false
+HAVE_NCURSES=true
 
 #=========================================================================
 # X stuff
 #=========================================================================
-NO_X_FOR_MF	= -DNO_X11WIN
+NO_X_FOR_MF	=
 
 # change the true/false definition of FOIL, if you get an error with wchar_t
 FOIL		= false
@@ -111,17 +111,17 @@
 platform	= $(shell ./config.guess | sed 's/-.*-/-/')
 CWD		:= $(shell pwd)
 INSTALL		= $(CWD)/$(KPSEDIR)/bin/install -c
-override prefix	= $(TETEXDIR)
-override bindir	= $(prefix)/bin/$(platform)
-override TEXMF	= $(TETEXDIR)/texmf
+override prefix	= $(PREFIX)
+override bindir	= $(PREFIX)/bin
+override TEXMF	= $(PREFIX)/share/texmf
 override PATH	:= $(bindir):$(CWD)/bin-extra:$(CWD)/$(KPSEDIR)/bin:$(PATH)
 
-CONFDIRS   = $(KPSEDIR) $(TEXIDIR)
+CONFDIRS   = $(KPSEDIR)
 ifeq ($(USE_DIALOG),true)
-SUBDIRS    = $(TEXIDIR) $(MKINDEXDIR) $(KPSEDIR) $(DIALOGDIR) bin-extra
+SUBDIRS    = $(MKINDEXDIR) $(KPSEDIR) $(DIALOGDIR) bin-extra
 CONFDIRS   += $(DIALOGDIR)
 else
-SUBDIRS    = $(TEXIDIR) $(MKINDEXDIR) $(KPSEDIR) bin-extra
+SUBDIRS    = $(MKINDEXDIR) $(KPSEDIR) bin-extra
 override USE_NCURSES = no
 endif
 
@@ -205,7 +205,6 @@
 	for i in $(SUBDIRS); do \
 	  (set -x; cd $$i; $(MAKE) $(PASSENV) $@ || exit 1); \
 	done
-	@strip $(bindir)/* >/dev/null 2>&1 || true
 
 rmcache:
 	rm -f config.cache
@@ -259,16 +258,7 @@
 	rm -rf tmp
 
 $(TETEXDIR)/texmf.cnf:
-	@echo
-	@echo "ERROR: The file $(TETEXDIR)/texmf.cnf does not exist."
-	@echo
-	@echo "Do not copy it from the source-tree to this location."
-	@echo "Instead, install the inputs-tree for teTeX (form"
-	@echo "teTeX-lib-$(VERSION).tar.gz or base/goodies series and "
-	@echo "make sure that TETEXDIR in this Makefile points to the"
-	@echo "directory where the files are installed."
-	@echo
-	@false
+	@true
 
 distrib: distrib-pre distrib-all distrib-install
 config: warn-texmfcnf