Merge pull request #18 from chewi/build

Various build fixes and improvements

.gitignore

@@ -1 +1,24 @@
+*.a
 *.o
+Makefile
+
+/Keyboard
+/Xinitrc
+/Xsession
+/Xsession2
+/amiwm
+/autom4te.cache/
+/config.log
+/config.status
+/config_util
+/configure
+/executecmd
+/gram.c
+/gram.h
+/kbdlexer.c
+/kbdmodule.c
+/kbdmodule.h
+/lex.c
+/ppmtoinfo
+/requestchoice
+/system.amiwmrc

Imakefile

@@ -1,87 +0,0 @@
-
-	PROGRAMS = amiwm requestchoice executecmd
-
-	AMIWM_HOME = /usr/X11/lib/X11/amiwm
-
-	SRCS1 = main.c drawinfo.c client.c frame.c icc.c \
-		icon.c menu.c diskobject.c gram.c lex.c rc.c
-	OBJS1 = main.o drawinfo.o client.o frame.o icc.o \
-		icon.o menu.o diskobject.o gram.o lex.o rc.o
-
-	SRCS2 = requestchoice.c drawinfo.c
-	OBJS2 = requestchoice.o drawinfo.o
-
-	SRCS3 = executecmd.c drawinfo.c
-	OBJS3 = executecmd.o drawinfo.o
-
-	YFLAGS = -d
-
-all::
-
-/* Some old implementations does not have LexFile and YaccFile... */
-
-#ifndef LexFile
-#define LexFile(file)                                                   @@\
-depend:: file.c                                                         @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) lex.yy.c file.c
-#endif /* LexFile */
- 
-#ifndef YaccFile
-#define YaccFile(file,flags)                                            @@\
-depend:: file.c                                                         @@\
-                                                                        @@\
-file.h file.c: file.y                                                   @@\
-	$(YACC) flags file.y                                            @@\
-	$(MV) y.tab.c file.c                                            @@\
-	$(MV) y.tab.h file.h                                            @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) y.tab.c y.tab.h file.h file.c
-#endif /* YaccFile */
-
-LexFile(lex)
-
-YaccFile(gram,$(YFLAGS))
-
-ComplexProgramTarget_1(amiwm, $(XLIB) $(XMULIB), $(OTHER_LIBS))
-
-ComplexProgramTarget_2(requestchoice, $(XLIB), $(OTHER_LIBS))
-
-ComplexProgramTarget_3(executecmd, $(XLIB), $(OTHER_LIBS))
-
-SpecialCObjectRule(menu,$(_NOOP_),'-DAMIWM_HOME="$(AMIWM_HOME)"')
-SpecialCObjectRule(rc,$(_NOOP_),'-DAMIWM_HOME="$(AMIWM_HOME)"')
-
-install ::
-	MakeDir($(AMIWM_HOME))
-	RemoveFile($(AMIWM_HOME)/requestchoice)
-	$(LN) $(BINDIR)/requestchoice $(AMIWM_HOME)/requestchoice
-	RemoveFile($(AMIWM_HOME)/executecmd)
-	$(LN) $(BINDIR)/executecmd $(AMIWM_HOME)/executecmd
-
-InstallNonExec(system.amiwmrc, $(AMIWM_HOME)/system.amiwmrc)
-InstallNonExec(def_tool.info, $(AMIWM_HOME)/def_tool.info)
-
-
-/*  Targets for my private use.  Not very portable.   // Marcus  */
-
-DISTFILES = README.md INSTALL Imakefile smakefile scoptions *.[chly] \
-	system.amiwmrc def_tool.info
-
-patch :
-	mv version.h old_version.h
-	sed < old_version.h 's/l/"/' | awk '-F"' '{ printf "%s\"%sl%s\"\n",$$1,$$2,1+$$3 }' > version.h
-	rm old_version.h
-
-dist : version.h clean
-	( version=`sed < version.h -e 's/^[^"]*"//' -e 's/"[^"]*$$//'`; \
-	  tarname="amiwm$$version.tar"; \
-	  mkdir amiwm; \
-	  cp $(DISTFILES) amiwm/; \
-	  rm -f $$tarname $$tarname.gz; \
-	  tar cf $$tarname amiwm; \
-	  rm -rf amiwm/; \
-	  gzip $$tarname; \
-	)

Makefile.in

@@ -5,16 +5,16 @@ CC = @CC@
 LEX = @LEX@
 YACC = @YACC@
 CFLAGS = @CFLAGS@
-YFLAGS = -d
+LDFLAGS = @LDFLAGS@
 DEFS = @DEFS@
 ALL_CFLAGS = -Wall -I. -I@srcdir@ -I@srcdir@/libami $(DEFS) $(CFLAGS) @X_CFLAGS@
 LIBS = @X_LIBS@ @X_PRE_LIBS@ -Llibami -lami @XT_LIB_KLUDGE@ -lXext -lXmu \
 	-lX11 @X_EXTRA_LIBS@ @LIBS@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
+bindir = @bindir@
-libdir = $(exec_prefix)/lib
+libdir = @libdir@
-mandir = $(prefix)/man
+mandir = @mandir@
 INSTALL = @INSTALL@
 LN_S = @LN_S@
 RM = -rm -f
@@ -38,8 +38,8 @@ SRCS = main.c screen.c client.c frame.c icc.c \
 		config_util.c launchermodule.c
 
 DISTFILES = README.md MODULES.md INSTALL LICENSE amiwm.1 \
-	configure configure.in Makefile.in install-sh smakefile scoptions \
+	configure configure.ac Makefile.in install-sh smakefile scoptions \
-	*.[chly] system.amiwmrc def_*.info *.map \
+	*.[chly] system.amiwmrc.in def_*.info *.map \
 	Background Background_resize Background_resize_norepeat \
 	Background_stretch Launcher Xresources.amiwm.in Amilogo.?m \
 	Xsession*.in Xinitrc.in amiwm-init libami/Makefile.in libami/*.[chly] \
@@ -79,108 +79,104 @@ ppmtoinfo.o: ppmtoinfo.c
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
 
 gram.h gram.c: gram.y
-	$(YACC) $(YFLAGS) $<
+	$(YACC) --defines=gram.h --output=gram.c $<
-	mv y.tab.c gram.c
-	mv y.tab.h gram.h
 
 lex.c: lex.l
 	$(LEX) -t $< > lex.c
 
 kbdmodule.h kbdmodule.c: kbdmodule.y
-	$(YACC) $(YFLAGS) $<
+	$(YACC) --defines=kbdmodule.h --output=kbdmodule.c $<
-	mv y.tab.c kbdmodule.c
-	mv y.tab.h kbdmodule.h
 
 kbdlexer.c: kbdlexer.l
 	$(LEX) -t $< > kbdlexer.c
 
-install: $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
+install: $(PROGS) $(MODULES) system.amiwmrc Xsession Xsession2 Xinitrc amiwm-init
-	-mkdir -p $(AMIWM_HOME)
+	-mkdir -p $(DESTDIR)$(AMIWM_HOME)
-	-mkdir -p $(AMIWM_MODULES)
+	-mkdir -p $(DESTDIR)$(AMIWM_MODULES)
-	$(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice
+	$(INSTALL) $(STRIPFLAG) requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice
-	$(INSTALL) $(STRIPFLAG) config_util $(AMIWM_HOME)/config_util
+	$(INSTALL) $(STRIPFLAG) config_util $(DESTDIR)$(AMIWM_HOME)/config_util
-	$(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd
+	$(INSTALL) $(STRIPFLAG) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd
 	for module in $(MODULES); do \
 	  if [ "$$module" = "Background" ]; then \
-	    $(INSTALL) $$module $(AMIWM_MODULES)/Background; \
+	    $(INSTALL) $$module $(DESTDIR)$(AMIWM_MODULES)/Background; \
 	  else \
 	    if [ "$$module" = "Background_resize" ]; then \
-	      $(INSTALL) $$module $(AMIWM_MODULES)/Background_resize; \
+	      $(INSTALL) $$module $(DESTDIR)$(AMIWM_MODULES)/Background_resize; \
 	    else \
 	      if [ "$$module" = "Background_stretch" ]; then \
-	        $(INSTALL) $$module $(AMIWM_MODULES)/Background_stretch; \
+	        $(INSTALL) $$module $(DESTDIR)$(AMIWM_MODULES)/Background_stretch; \
 	      else \
 		if [ "$$module" = "def_tool.info" ]; then \
-		    $(INSTALL) $$module $(AMIWM_MODULES)/def_tool.info; \
+		    $(INSTALL) $$module $(DESTDIR)$(AMIWM_MODULES)/def_tool.info; \
 		else \
-		    $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_MODULES)/$$module; \
+		    $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_MODULES)/$$module; \
 		fi; \
 	      fi; \
 	    fi; \
 	  fi; \
 	done
-	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc
+	$(INSTALL) -m 644 system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
-	$(INSTALL) -m 644 $(srcdir)/def_disk.info $(AMIWM_HOME)/def_tool.info
+	$(INSTALL) -m 644 $(srcdir)/def_disk.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
-	$(INSTALL) -m 644 $(srcdir)/def_drawer.info $(AMIWM_HOME)/def_drawer.info
+	$(INSTALL) -m 644 $(srcdir)/def_drawer.info $(DESTDIR)$(AMIWM_HOME)/def_drawer.info
-	$(INSTALL) -m 644 $(srcdir)/def_project.info $(AMIWM_HOME)/def_project.info
+	$(INSTALL) -m 644 $(srcdir)/def_project.info $(DESTDIR)$(AMIWM_HOME)/def_project.info
-	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info
+	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
-	$(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map
+	$(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map
-	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map
+	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map
-	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(AMIWM_HOME)/schwartz.map
+	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map
-	$(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession
+	$(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession
-	$(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2
+	$(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2
-	$(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc
+	$(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc
-	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init
+	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init
-	-mkdir -p $(bindir)
+	-mkdir -p $(DESTDIR)$(bindir)
-	$(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm
+	$(INSTALL) $(STRIPFLAG) amiwm $(DESTDIR)$(bindir)/amiwm
-	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo
+	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo
-	$(RM) $(bindir)/requestchoice
+	$(RM) $(DESTDIR)$(bindir)/requestchoice
-	$(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice
+	$(LN_S) $(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice
-	-mkdir -p $(mandir)/man1
+	-mkdir -p $(DESTDIR)$(mandir)/man1
-	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1
+	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1
 
 fs-install: Filesystem
-	$(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem
+	$(INSTALL) $(STRIPFLAG) Filesystem $(DESTDIR)$(AMIWM_HOME)/Filesystem
-	$(INSTALL) -m 644 def_disk.info $(AMIWM_HOME)/def_disk.info
+	$(INSTALL) -m 644 def_disk.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info
-	$(INSTALL) -m 644 def_drawer.info $(AMIWM_HOME)/def_disk.info
+	$(INSTALL) -m 644 def_drawer.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info
 
 cde-install: Xresources.amiwm Amilogo.bm Amilogo.pm
-	-mkdir -p $(DT_DIR)/config/C/Xresources.d
+	-mkdir -p $(DESTDIR)$(DT_DIR)/config/C/Xresources.d
-	$(INSTALL) -m 644 Xresources.amiwm $(DT_DIR)/config/C/Xresources.d/Xresources.amiwm
+	$(INSTALL) -m 644 Xresources.amiwm $(DESTDIR)$(DT_DIR)/config/C/Xresources.d/Xresources.amiwm
-	-mkdir -p $(DT_DIR)/appconfig/icons/C
+	-mkdir -p $(DESTDIR)$(DT_DIR)/appconfig/icons/C
-	$(INSTALL) -m 644 Amilogo.bm $(DT_DIR)/appconfig/icons/C/Amilogo.bm
+	$(INSTALL) -m 644 Amilogo.bm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.bm
-	$(INSTALL) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm
+	$(INSTALL) -m 644 Amilogo.pm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.pm
 
 
 amiwm: $(OBJS) $(LIBAMI)
-	$(CC) -o amiwm $(OBJS) $(LIBS)
+	$(CC) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS)
 
 requestchoice: requestchoice.o $(LIBAMI)
-	$(CC) -o requestchoice requestchoice.o $(LIBS)
+	$(CC) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS)
 
 config_util: config_util.o $(LIBAMI)
-	$(CC) -o config_util config_util.o $(LIBS)
+	$(CC) $(LDFLAGS) -o config_util config_util.o $(LIBS)
 
 executecmd: executecmd.o $(LIBAMI)
-	$(CC) -o executecmd executecmd.o $(LIBS)
+	$(CC) $(LDFLAGS) -o executecmd executecmd.o $(LIBS)
 
 Filesystem: filesystem.o $(LIBAMI)
-	$(CC) -o Filesystem filesystem.o $(LIBS)
+	$(CC) $(LDFLAGS) -o Filesystem filesystem.o $(LIBS)
 
 Keyboard: kbdmodule.o kbdlexer.o $(LIBAMI)
-	$(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
+	$(CC) $(LDFLAGS) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
 
 Battery: battery_module.o $(LIBAMI)
-	$(CC) -o Battery battery_module.o $(LIBS)
+	$(CC) $(LDFLAGS) -o Battery battery_module.o $(LIBS)
 
 Launcher: launchermodule.o $(LIBAMI)
-	$(CC) -o Launcher launchermodule.o $(LIBS)
+	$(CC) $(LDFLAGS) -o Launcher launchermodule.o $(LIBS)
 
 ppmtoinfo: ppmtoinfo.o
-	$(CC) -o ppmtoinfo ppmtoinfo.o -lm
+	$(CC) $(LDFLAGS) -o ppmtoinfo ppmtoinfo.o -lm
 
 localetest: localetest.o $(LIBAMI)
-	$(CC) -o localetest localetest.o $(LIBS)
+	$(CC) $(LDFLAGS) -o localetest localetest.o $(LIBS)
 
 clean: lib_clean
 	$(RM) core $(PROGS) $(LIBAMI) Keyboard Battery Launcher *.o
@@ -213,8 +209,8 @@ dist: version.h clean
 	  gzip $$tarname; \
 	)
 
-$(srcdir)/configure: $(srcdir)/configure.in
+$(srcdir)/configure: $(srcdir)/configure.ac
-	autoconf $(srcdir)/configure.in > $(srcdir)/configure
+	autoconf $(srcdir)/configure.ac > $(srcdir)/configure
 
 config.status: $(srcdir)/configure
 	$(srcdir)/configure
@@ -225,18 +221,8 @@ Makefile: $(srcdir)/Makefile.in config.status
 libami/Makefile: $(srcdir)/libami/Makefile.in config.status
 	./config.status
 
-Xresources.amiwm: $(srcdir)/Xresources.amiwm.in
+system.amiwmrc Xresources.amiwm Xsession Xsession2 Xinitrc: %: $(srcdir)/%.in config.status
-	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < $(srcdir)/Xresources.amiwm.in > Xresources.amiwm
+	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < "$<" > "$@"
-
-Xsession: $(srcdir)/Xsession.in config.status
-	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < $(srcdir)/Xsession.in > Xsession
-
-Xsession2: $(srcdir)/Xsession2.in config.status
-	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < $(srcdir)/Xsession2.in > Xsession2
-
-Xinitrc: $(srcdir)/Xinitrc.in config.status
-	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < $(srcdir)/Xinitrc.in > Xinitrc
-
 
 depend:: $(SRCS)
 	-@rm Makefile.bak

Xsession2.in

@@ -24,11 +24,11 @@ HOME_XINITRC="$HOME/.xinitrc"
 
     if [ -f $XINITRC ]; then
 	echo "using xinitrc file: $XINITRC"
-        /bin/ksh $XINITRC
+        /bin/sh $XINITRC
     else
 	echo "xinitrc file: $XINITRC not found"
 	if [ -f $DEFAULT_XINITRC ]; then
 	    echo "using xinitrc: $DEFAULT_XINITRC"
-	    /bin/ksh $DEFAULT_XINITRC 
+	    /bin/sh $DEFAULT_XINITRC
 	fi
     fi

configure.ac

@@ -26,7 +26,6 @@ AC_C_CONST
 AC_C_CHAR_UNSIGNED
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_HEADER_TIME
 AC_STRUCT_TM
 
 AC_FUNC_ALLOCA
@@ -99,6 +98,7 @@ fi
 
 AC_MSG_CHECKING([byteorder])
 AC_TRY_RUN([
+#include <stdlib.h>
 int main()
 {
   union { int i; char c[sizeof(int)]; } v;

gram.y

@@ -13,7 +13,6 @@ extern void set_mwb_palette(void);
 extern void set_schwartz_palette(void);
 extern void set_custom_palette(char *fn);
 extern void add_toolitem(char *, char *, char *, int);
-extern Scrn *openscreen(char *, Window);
 extern void create_module(Scrn *, char *, char *);
 extern char *default_colors[NUMDRIPENS];
 extern char *default_screenfont, *label_font_name;
@@ -44,6 +43,17 @@ static void append_to(char **x, char *y)
 }
 
 static int ti_level=0;
+
+int yylex();
+
+extern char *progname;
+extern int ParseError;
+int yyerror(s) char *s;
+{
+    fprintf (stderr, "%s: error in input file:  %s\n", progname, s ? s : "");
+    ParseError = 1;
+    return 0;
+}
 %}
 
 %union
@@ -197,11 +207,3 @@ forcemove_policy : ALWAYS { $$ = FM_ALWAYS; }
 		 ;
 
 %%
-extern char *progname;
-extern int ParseError;
-int yyerror(s) char *s;
-{
-    fprintf (stderr, "%s: error in input file:  %s\n", progname, s ? s : "");
-    ParseError = 1;
-    return 0;
-}

icc.c

@@ -5,6 +5,7 @@
 #include "style.h"
 #include "prefs.h"
 
+#include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 

iconinfo.pl

@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 
 sub chompstring {
     my ($len, $rest)=unpack("Na*", $_[0]);

install-sh

@@ -1,238 +1,529 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-# This comes from X11R5.
+
+scriptversion=2018-03-11.20; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
-#
 
-
+tab='	'
-# set DOITPROG to echo to test this script
+nl='
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-tranformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
 '
-IFS="${IFS-${defaultIFS}}"
+IFS=" $tab$nl"
 
-oIFS="${IFS}"
+# Set DOITPROG to "echo" to test this script.
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
 
-pathcomp=''
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
 
-while [ $# -ne 0 ] ; do
+# Put in absolute file names if you don't have them in your path;
-	pathcomp="${pathcomp}${1}"
+# or use environment vars.
-	shift
 
-	if [ ! -d "${pathcomp}" ] ;
+chgrpprog=${CHGRPPROG-chgrp}
-        then
+chmodprog=${CHMODPROG-chmod}
-		$mkdirprog "${pathcomp}"
+chownprog=${CHOWNPROG-chown}
-	else
+cmpprog=${CMPPROG-cmp}
-		true
+cpprog=${CPPROG-cp}
-	fi
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
 
-	pathcomp="${pathcomp}/"
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  shift
 done
+
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
 fi
 
-if [ x"$dir_arg" != x ]
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-then
+  # When -d is used, all remaining arguments are directories to create.
-	$doit $instcmd $dst &&
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+if test $# -eq 0; then
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+  if test -z "$dir_arg"; then
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+    echo "$0: no input file specified." >&2
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+    exit 1
-else
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
 
-# If we're going to rename the final executable, determine the name now.
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
 
-	if [ x"$transformarg" = x ] 
+if test -z "$dir_arg"; then
-	then
+  do_exit='(exit $ret); exit $ret'
-		dstfile=`basename $dst`
+  trap "ret=129; $do_exit" 1
-	else
+  trap "ret=130; $do_exit" 2
-		dstfile=`basename $dst $transformbasename | 
+  trap "ret=141; $do_exit" 13
-			sed $transformarg`$transformbasename
+  trap "ret=143; $do_exit" 15
-	fi
 
-# don't allow the sed command to completely eliminate the filename
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
 
-	if [ x"$dstfile" = x ] 
+    *[0-7])
-	then
+      if test -z "$stripcmd"; then
-		dstfile=`basename $dst`
+        u_plus_rw=
-	else
+      else
-		true
+        u_plus_rw='% 200'
-	fi
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
 
-# Make a temp file name in the proper directory.
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
 
-	dsttmp=$dstdir/#inst.$$#
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
 
-# Move or copy the file name to the temp name
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
 
-	$doit $instcmd $src $dsttmp &&
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
 
-	trap "rm -f ${dsttmp}" 0 &&
+    # If destination is a directory, append the input filename.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
 
-# and set any options; do chmod last to preserve setuid bits
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
 
-# If any of these fail, we abort the whole thing.  If we want to
+  obsolete_mkdir_used=false
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+  if test $dstdir_status != 0; then
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+    case $posix_mkdir in
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+      '')
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 
-# Now rename the file to the real destination.
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
 
-	$doit $rmcmd -f $dstdir/$dstfile &&
+        # With -d, create the new directory with the user-specified mode.
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
 
-fi &&
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
+            # here however when possible just to lower collision chance.
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
 
-exit 0
+            # Because "mkdir -p" follows existing symlinks and we likely work
+            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+            # directory is successfully created first before we actually test
+            # 'mkdir -p' feature.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

kbdlexer.l

@@ -1,3 +1,4 @@
+%option noyywrap
 %{
 #include <X11/Xmu/CharSet.h>
 #include <string.h>
@@ -139,9 +140,6 @@ int parse_keyword(char *str, YYSTYPE *val)
                           progname, yytext); }
 %%
 
-#ifndef yywrap
-int yywrap() { return 1; }
-#endif
 #undef input
 #define input() ((*inptr)?(*inptr++):0)
 #undef unput

kbdmodule.y

@@ -8,6 +8,14 @@ void docmd(XEvent *e, void *callback)
   ((void (*)(Window))callback)(e->xany.window);
 }
 
+int yylex();
+
+char *progname;
+int yyerror(s) char *s;
+{
+    fprintf (stderr, "%s: error in input file:  %s\n", progname, s ? s : "");
+    return 0;
+}
 %}
 
 %union
@@ -55,14 +63,6 @@ command			: FUNCTION { $$=$1; }
 
 %%
 
-char *progname;
-
-int yyerror(s) char *s;
-{
-    fprintf (stderr, "%s: error in input file:  %s\n", progname, s ? s : "");
-    return 0;
-}
-
 int main(int argc, char *argv[])
 {
   char *arg=md_init(argc, argv);

lex.l

@@ -1,3 +1,4 @@
+%option noyywrap
 %{
 #include <stdio.h>
 #include "gram.h"
@@ -6,7 +7,6 @@ extern int ParseError;
 extern FILE *rcfile;
 #undef yyin
 #define yyin rcfile
-#define yywrap() 1
 extern int parse_keyword(char *);
 void fixup_string(char *, char *);
 #define YY_SKIP_YYWRAP

libami/Makefile.in

@@ -6,7 +6,7 @@ LEX = @LEX@
 YACC = @YACC@
 RANLIB = @RANLIB@
 CFLAGS = @CFLAGS@
-YFLAGS = -d
+LDFLAGS = @LDFLAGS@
 DEFS = @DEFS@
 ALL_CFLAGS = -Wall -I@srcdir@ -I@top_srcdir@ $(DEFS) $(CFLAGS) @X_CFLAGS@
 LIBS = @X_LIBS@ @X_PRE_LIBS@ -lXext -lXmu -lX11 @X_EXTRA_LIBS@ @LIBS@
@@ -34,7 +34,7 @@ clean :
 	$(RM) *.o libami.a
 
 libami.a : $(OBJS)
-	ar rc libami.a $(OBJS)
+	$(AR) rc libami.a $(OBJS)
 	$(RANLIB) libami.a
 
 .c.o:

module.c

@@ -13,9 +13,6 @@
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@@ -42,7 +39,6 @@ extern Display *dpy;
 extern void add_fd_to_set(int);
 extern void remove_fd_from_set(int);
 
-extern void screentoback();
 extern void raiselowerclient(Client *, int);
 extern void wberror(Scrn *, char *);
 extern void reparent(Client *);

ppmtoinfo.c

@@ -1,12 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 #define WB_DISKMAGIC	0xe310
 #define WB_DISKVERSION	1

screen.h

@@ -47,4 +47,9 @@ extern Scrn * openscreen(char *, Window);
 extern void realizescreens();
 extern void screentoback();
 
+void closescreen();
+Scrn *openscreen(char *deftitle, Window root);
+void realizescreens();
+void screentoback();
+
 #endif

system.amiwmrc.in

@@ -1,7 +1,7 @@
 FastQuit Off
 SizeBorder Right
 IconPalette MagicWB
-IconDir "/usr/local/lib/amiwm/"
+IconDir "@AMIWM_HOME@/"
 DefaultIcon "def_tool.info"
 CustomIconsOnly Off
 ShortLabelIcons Off