--- makefile.orig	Wed Aug 24 08:45:25 2005
+++ makefile	Fri Oct 14 02:14:23 2005
@@ -269,11 +269,10 @@
 # DEBUGGING = 1
 # TRACING = -g
 
-PREFIX	= /home/jeff
 BINDIR	= $(PREFIX)/bin
-LOUTLIBDIR	= $(PREFIX)/lout.lib
-LOUTDOCDIR	= $(PREFIX)/lout.doc
-MANDIR	= $(PREFIX)/lout.man
+LOUTLIBDIR	= $(PREFIX)/share/lout
+LOUTDOCDIR	= $(PREFIX)/share/doc/lout
+MANDIR	= $(PREFIX)/man/man1
 
 LIBFONT = font
 LIBMAPS = maps
@@ -274,23 +274,23 @@
 CHARIN	= 1
 CHAROUT	= 0
 
-USELOC	= 1
+USELOC	= 0
 LOC_FR	= fr
 LOC_DE	= de
 
 COLLATE	= 1
 
-PDF_COMPRESSION	= 0
-ZLIB		=
+PDF_COMPRESSION	= 1
+ZLIB		= -lz
 ZLIBPATH	=
 
-CC	= gcc
+#CC	= gcc
 
-RCOPY	= cp -r
+RCOPY	= cp -R
 
-COPTS	= -ansi -pedantic -Wall -O3
+#COPTS	= -ansi -pedantic -Wall -O3
 
-CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
+CFLAGS	+= -DOS_UNIX=$(OSUNIX)					\
 	  -DOS_DOS=$(OSDOS)					\
 	  -DOS_MAC=$(OSMAC)					\
 	  -DDB_FIX=$(DBFIX)					\
@@ -336,42 +336,41 @@
 install: lout prg2lout
 	@echo ""
 	@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
-	cp lout $(BINDIR)/lout
-	chmod 755 $(BINDIR)/lout
-	cp prg2lout $(BINDIR)/prg2lout
-	chmod 755 $(BINDIR)/prg2lout
+	install -c -s -o bin -g bin lout $(BINDIR)/lout
+	install -c -s -o bin -g bin prg2lout $(BINDIR)/prg2lout
 	@echo ""
 	@echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)"
-	mkdir $(LOUTLIBDIR)
+	-mkdir $(LOUTLIBDIR)
 	chmod 755 $(LOUTLIBDIR)
 	@echo ""
-	mkdir $(LOUTLIBDIR)/$(LIBINCL)
+	-mkdir $(LOUTLIBDIR)/$(LIBINCL)
 	chmod 755 $(LOUTLIBDIR)/$(LIBINCL)
 	cp include/* $(LOUTLIBDIR)/$(LIBINCL)
 	chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/*
 	@echo ""
-	mkdir $(LOUTLIBDIR)/$(LIBDATA)
+	-mkdir $(LOUTLIBDIR)/$(LIBDATA)
 	chmod 755 $(LOUTLIBDIR)/$(LIBDATA)
 	cp data/* $(LOUTLIBDIR)/$(LIBDATA)
 	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
 	@echo ""
-	mkdir $(LOUTLIBDIR)/$(LIBHYPH)
+	-mkdir $(LOUTLIBDIR)/$(LIBHYPH)
 	chmod 755 $(LOUTLIBDIR)/$(LIBHYPH)
 	cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH)
 	chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
 	@echo ""
-	mkdir $(LOUTLIBDIR)/$(LIBFONT)
+	-mkdir $(LOUTLIBDIR)/$(LIBFONT)
 	chmod 755 $(LOUTLIBDIR)/$(LIBFONT)
 	cp font/* $(LOUTLIBDIR)/$(LIBFONT)
 	chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/*
 	@echo ""
-	mkdir $(LOUTLIBDIR)/$(LIBMAPS)
+	-mkdir $(LOUTLIBDIR)/$(LIBMAPS)
 	chmod 755 $(LOUTLIBDIR)/$(LIBMAPS)
 	cp maps/* $(LOUTLIBDIR)/$(LIBMAPS)
 	chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/*
 	@echo ""
-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)
+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)
 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
+	touch $(LOUTLIBDIR)/$(LIBLOCA)/.place_holder
 	@echo ""
 	@echo "(c) Initializing run (should be silent, no errors expected)"
 	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
@@ -379,6 +378,7 @@
 	@echo "(d) Changing mode of files just created by initializing run"
 	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
 	chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
+	chown -R bin:bin $(LOUTLIBDIR)
 
 installman:
 	@echo ""
@@ -387,25 +387,29 @@
 	    -e "s@<LOUTDOCDIR>@$(LOUTDOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
 	man/lout.1 > $(MANDIR)/lout.1
 	chmod 644 $(MANDIR)/lout.1
+	chown bin:bin $(MANDIR)/lout.1
 	cp man/prg2lout.1 $(MANDIR)/prg2lout.1
 	chmod 644 $(MANDIR)/prg2lout.1
+	chown bin:bin $(MANDIR)/prg2lout.1
 
 installdoc:
 	@echo ""
 	@echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into it"
+	-mkdir -p $(LOUTDOCDIR)
 	$(RCOPY) doc/* $(LOUTDOCDIR)
 	chmod 755 $(LOUTDOCDIR)
 	chmod 755 $(LOUTDOCDIR)/*
 	chmod 644 $(LOUTDOCDIR)/*/*
+	chown -R bin:bin $(LOUTDOCDIR)
 
 allinstall:	install installman installdoc
 
 installfr:
 	@echo ""
 	@echo "Putting French error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)"
-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
 	cp locale/msgs.fr $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
 	gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
@@ -413,9 +417,9 @@
 installde:
 	@echo ""
 	@echo "Putting German error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)"
-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
 	cp locale/msgs.de $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
 	gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\