amiwm (0.20.48-7.1) direct (non packaging) changes

--- amiwm-0.20.48.orig/amiwm.1
+++ amiwm-0.20.48/amiwm.1
@@ -10,7 +10,7 @@
 .SH DESCRIPTION
 .I amiwm
 is an X Window manager that tries to make your workstation look like
-an Amiga®.
+an Amiga\*R.
 
 .SH OPTIONS
 .I Amiwm 
@@ -43,7 +43,7 @@
 
 .SH IconPalette {system|magicwb|schwartz|\f1\*(lq\f3filename"}
 
-Selects either the Workbench® default palette, or the MagicWorkbench
+Selects either the Workbench\*R default palette, or the MagicWorkbench
 standard palette for use with icons.  The third option is a 16 color
 palette used on the "Eric Schwartz Productions CD Archive".  Alternatively,
 the filename of a PPM file representing the palette to use can be used.
--- amiwm-0.20.48.orig/Makefile.in
+++ amiwm-0.20.48/Makefile.in
@@ -1,3 +1,6 @@
+# Edited for Debian GNU/Linux.
+
+EXAMPLES = $(DESTDIR)/usr/share/doc/amiwm/examples
 srcdir = @srcdir@
 VPATH = @srcdir@
 SHELL = /bin/sh
@@ -12,9 +15,11 @@
 	-lX11 @X_EXTRA_LIBS@ @LIBS@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-mandir = $(prefix)/man
+bindir = $(DESTDIR)/usr/bin
+obindir = $(DESTDIR)/usr/bin
+libdir = $(DESTDIR)/usr/lib
+mandir = $(DESTDIR)/usr/share/man
+xmandir = $(DESTDIR)/usr/share/man
 INSTALL = @INSTALL@
 LN_S = @LN_S@
 RM = -rm -f
@@ -96,16 +101,19 @@
 	$(INSTALL) -m 644 system.map $(AMIWM_HOME)/system.map
 	$(INSTALL) -m 644 magicwb.map $(AMIWM_HOME)/magicwb.map
 	$(INSTALL) -m 644 schwartz.map $(AMIWM_HOME)/schwartz.map
-	$(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession
-	$(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2
-	$(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc
-	$(INSTALL) -m 755 amiwm-init $(AMIWM_HOME)/amiwm-init
+	-mkdir -p $(EXAMPLES)
+	$(INSTALL) -m 755 Xsession $(EXAMPLES)/Xsession
+	$(INSTALL) -m 755 Xsession2 $(EXAMPLES)/Xsession2
+	$(INSTALL) -m 755 Xinitrc $(EXAMPLES)/Xinitrc
+	$(INSTALL) -m 755 amiwm-init $(EXAMPLES)/amiwm-init
 	$(INSTALL) -s amiwm $(bindir)/amiwm
-	$(INSTALL) -s ppmtoinfo $(bindir)/ppmtoinfo
-	$(RM) $(bindir)/requestchoice
-	$(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice
+	$(INSTALL) -s ppmtoinfo $(obindir)/ppmtoinfo
+	$(RM) $(obindir)/requestchoice
+	$(LN_S) ../lib/amiwm/requestchoice $(obindir)/requestchoice
 	-mkdir -p $(mandir)/man1
-	$(INSTALL) -m 644 amiwm.1 $(mandir)/man1/amiwm.1
+	$(INSTALL) -m 644 amiwm.1 $(xmandir)/man1/amiwm.1
+	$(INSTALL) -m 644 debian/ppmtoinfo.1 $(mandir)/man1/ppmtoinfo.1
+	$(INSTALL) -m 644 debian/requestchoice.1 $(mandir)/man1/requestchoice.1
 
 cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm
 	-mkdir -p $(DT_DIR)/config/C/Xresources.d
@@ -131,7 +139,7 @@
 	$(CC) -o ppmtoinfo ppmtoinfo.o -lm
 
 clean :
-	$(RM) core $(PROGS) $(LIBAMI) *.o libami/*.o
+	$(RM) core $(PROGS) $(LIBAMI) Keyboard *.o libami/*.o
 	$(RM) lex.yy.c lex.c y.tab.c y.tab.h gram.h gram.c
 	$(RM) kbdlexer.c kbdmodule.h kbdmodule.c
 	$(RM) config.log
--- amiwm-0.20.48.orig/lex.l
+++ amiwm-0.20.48/lex.l
@@ -6,6 +6,7 @@
 extern FILE *rcfile;
 #undef yyin
 #define yyin rcfile
+#define YY_SKIP_YYWRAP
 #define yywrap() 1
 extern int parse_keyword(char *);
 void fixup_string(char *, char *);
--- amiwm-0.20.48.orig/Xinitrc.in
+++ amiwm-0.20.48/Xinitrc.in
@@ -1,3 +1,4 @@
+#!/bin/ksh
 # AmiWM startup script
 
 xrdb $OPENWINHOME/lib/Xdefaults		# Load Default X11 resource database
--- amiwm-0.20.48.orig/libami/Makefile
+++ amiwm-0.20.48/libami/Makefile
@@ -0,0 +1,43 @@
+# Generated automatically from Makefile.in by configure.
+srcdir = .
+SHELL = /bin/sh
+CC = gcc
+LEX = flex
+YACC = bison -y
+RANLIB = ranlib
+CFLAGS = -g -O2
+YFLAGS = -d
+DEFS =  -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_RESOURCE_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_TERMIO_H=1 -DHAVE_X11_EXTENSIONS_SHAPE_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DRETSIGTYPE=void -DHAVE_WAIT3=1 -DHAVE_SELECT=1 -DHAVE_STRDUP=1 -DHAVE_WAITPID=1 -DHAVE_XSHAPE=1 -DBSD_STYLE_GETTIMEOFDAY=1 -DLAME_ENDIAN=1 
+ALL_CFLAGS = -I. -I.. $(DEFS) $(CFLAGS) 
+LIBS =   -lSM -lICE -lXext -lXmu -lX11  
+prefix = /usr
+exec_prefix = ${prefix}
+bindir = $(exec_prefix)/bin
+libdir = $(exec_prefix)/lib
+INSTALL = /usr/bin/install -c
+LN_S = ln -s
+
+OBJS  = drawinfo.o module.o broker.o eventdispatcher.o mdscreen.o \
+	mdicon.o mdwindow.o kbdsupport.o hotkey.o \
+	lists.o readargs.o iconlib.o iconutil.o error.o strutil.o
+
+SRCS = drawinfo.c module.c broker.c eventdispatcher.c mdscreen.c \
+	mdicon.c mdwindow.c kbdsupport.c hotkey.c \
+	lists.c readargs.c iconlib.c iconutil.c error.c strutil.c
+
+all : libami.a
+
+libami.a : $(OBJS)
+	ar rc libami.a $(OBJS)
+	$(RANLIB) libami.a
+
+.c.o:
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
+
+depend: $(SRCS)
+	-@rm Makefile.bak
+	mv Makefile Makefile.bak
+	( sed '/^#--DO NOT REMOVE THIS LINE--$$/q' < Makefile.bak ; \
+	  $(CC) -MM $(ALL_CFLAGS) $(SRCS) ) > Makefile
+
+#--DO NOT REMOVE THIS LINE--