--- a/lisp/w3/Makefile	Mon Aug 13 08:45:53 2007 +0200
+++ b/lisp/w3/Makefile	Mon Aug 13 08:46:35 2007 +0200
@@ -1,9 +1,8 @@
 # what emacs is called on your system
 EMACS = emacs
 
-# How to make a directory
-# need a -p if you want to make the parents!
-MKDIR = mkdir
+# How to install a file
+INSTALL = install
 
 # Various other stuff used
 RM    = rm -f
@@ -20,7 +19,7 @@
 DOTEMACS      = $$HOME/.emacs
 
 # Where the Emacs-W3 configuration files should be installed
-DOTDIR = $$HOME/.w3/
+DOTDIR = $$HOME/.w3
 
 # Change this to be how to convert texinfo files into info files
 # examples:
@@ -30,7 +29,7 @@
 
 ############## no user servicable parts beyond this point ###################
 # Have to preload a few things to get a nice clean compile
-SHELL=/bin/sh
+
 DEPS = -l ./docomp.el -l ./w3-vars.el
 
 # compile with noninteractive and relatively clean environment
@@ -42,21 +41,28 @@
 SOURCES = \
 	w3.el w3-draw.el w3-e19.el w3-mule.el w3-parse.el w3-print.el	\
 	w3-vars.el w3-xemac.el w3-style.el w3-about.el w3-hot.el	\
-	w3-toolbar.el font.el						\
+	w3-toolbar.el font.el w3-sysdp.el				\
 	w3-annotat.el w3-auto.el w3-forms.el images.el w3-imap.el	\
 	w3-emulate.el w3-menu.el w3-keyword.el w3-mouse.el widget.el	\
-	widget-edit.el w3-widget.el w3-speak.el w3-prefs.el
+	widget-edit.el w3-widget.el w3-speak.el w3-prefs.el w3-latex.el
 
-OBJECTS = $(SOURCES:.el=.elc)
+OBJECTS = \
+	w3.elc w3-draw.elc w3-e19.elc w3-mule.elc w3-parse.elc		\
+	w3-print.elc w3-vars.elc w3-xemac.elc w3-style.elc		\
+	w3-about.elc w3-hot.elc						\
+	w3-toolbar.elc font.elc w3-annotat.elc w3-auto.elc		\
+	w3-forms.elc images.elc w3-imap.elc w3-emulate.elc w3-menu.elc	\
+	w3-keyword.elc w3-mouse.elc widget.elc widget-edit.elc		\
+	w3-widget.elc w3-speak.elc w3-prefs.elc w3-latex.elc
 
 DISTFILES     = Makefile ChangeLog $(SOURCES) w3.txi docomp.el	\
-		clean-cache default.css w3-sysdp.el
+		clean-cache default.css
 
 .SUFFIXES: .elc .el .el,v
 
 .el.elc:
-	@echo Compiling $<
-	@URLDIR=$(URLDIR) $(EMACS) $(BATCHFLAGS) $(DEPS) -f batch-byte-compile $<
+	URLDIR=$(URLDIR) $(EMACS) $(BATCHFLAGS) $(DEPS) 	\
+		-f batch-byte-compile $<
 
 w3:	$(URLDIR) docomp.el $(OBJECTS)
 	@echo Build of w3 complete...
@@ -69,17 +75,17 @@
 
 install: all
 	@echo Installing in $(LISPDIR)
-	@if [ ! -d $(LISPDIR) ] ; then $(MKDIR) $(LISPDIR) ; fi
-	@(cd $(LISPDIR) ; $(RM) $(SOURCES) $(OBJECTS) w3-sysdp.el*)
-	@$(CP) $(SOURCES) $(OBJECTS) THIS* $(LISPDIR)
-	@if [ ! -d $(INFODIR) ] ; then $(MKDIR) $(INFODIR) ; fi
-	@$(CP) w3.info* $(INFODIR)
-	@$(CP) default.css $(DOTDIR)/stylesheet
+	$(INSTALL) -d $(LISPDIR)
+	$(INSTALL) -m 644 $(SOURCES) $(OBJECTS) $(LISPDIR)
+	$(INSTALL) -d $(INFODIR)
+	$(INSTALL) -m 644 w3.info* $(INFODIR)
+	$(INSTALL) -d $(DOTDIR)
+	$(INSTALL) -m 644 default.css $(DOTDIR)/stylesheet
 
 emacs:	
 	@echo Adding w3 setup to $(DOTEMACS)
-	$(EMACS) -batch -q -l docomp.el -f hack-dot-emacs $(DOTEMACS) \
-		 $(LISPDIR) $(URLDIR)
+	URLDIR=$(URLDIR) $(EMACS) -batch -q -l docomp.el -f hack-dot-emacs \
+		 $(DOTEMACS) $(LISPDIR) $(URLDIR)
 
 clean:
 	$(RM) $(OBJECTS)