--- a/lisp/w3/Makefile	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/w3/Makefile	Mon Aug 13 09:02:59 2007 +0200
@@ -1,10 +1,3 @@
-# where the w3 lisp files should go
-prefix = /usr/local
-infodir = $(prefix)/info
-datadir = $(prefix)/share
-lispdir = $(datadir)/emacs/site-lisp
-confdir = $(datadir)/emacs/w3
-
 # what emacs is called on your system
 EMACS = emacs
 
@@ -15,6 +8,19 @@
 RM    = rm -f
 CP    = cp
 
+# where the Info file should go
+INFODIR = ../info
+
+# where the w3 lisp files should go
+LISPDIR = $$HOME/lisp
+URLDIR  = ../url
+
+# Change this to be where your .emacs file is stored
+DOTEMACS      = $$HOME/.emacs
+
+# Where the Emacs-W3 configuration files should be installed
+DOTDIR = $$HOME/.w3
+
 # Change this to be how to convert texinfo files into info files
 # examples:
 #	$(EMACS) -batch -q -f batch-texinfo-format
@@ -32,60 +38,58 @@
 # files that contain variables and macros that everything else depends on
 CORE = docomp.el
 
-URLSOURCES = \
-	url-nfs.el url-file.el url-cookie.el url-parse.el url-irc.el	\
-	url-gopher.el url-http.el url-mail.el url-misc.el url-news.el	\
-	url-vars.el url-auth.el mm.el url-gw.el ssl.el base64.el	\
-	url.el socks.el url-cache.el url-ns.el
-
-CUSTOMSOURCES = # widget.el widget-edit.el
-CUSTOMOBJECTS = $(CUSTOMSOURCES:.el=.elc)
-URLOBJECTS    = $(URLSOURCES:.el=.elc)
+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-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 w3-latex.el
 
-SOURCES = \
-	$(CUSTOMSOURCES) $(URLSOURCES) mule-sysdp.el w3-widget.el	\
-	w3-imap.el css.el dsssl.el font.el images.el w3-vars.el		\
-	w3-cus.el w3-style.el w3-keyword.el w3-forms.el w3-emulate.el	\
-	w3-auto.el w3-menu.el w3-mouse.el w3-toolbar.el	w3-prefs.el	\
-	w3-speak.el w3-latex.el w3-parse.el w3-display.el w3-print.el	\
-	w3-about.el w3-hot.el w3-e19.el w3-xemac.el w3.el w3-script.el	\
-	w3-jscript.el w3-elisp.el
+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
 
-OBJECTS = $(SOURCES:.el=.elc)
-
-# Warning!  Currently, the following file can _NOT_ be bytecompiled.
-EXTRAS = w3-sysdp.el
+DISTFILES     = Makefile ChangeLog $(SOURCES) w3.txi docomp.el	\
+		clean-cache default.css
 
 .SUFFIXES: .elc .el .el,v
 
 .el.elc:
-	$(EMACS) $(BATCHFLAGS) $(DEPS) -f batch-byte-compile $<
+	URLDIR=$(URLDIR) $(EMACS) $(BATCHFLAGS) $(DEPS) 	\
+		-f batch-byte-compile $<
 
-w3:	check-custom docomp.el $(OBJECTS)
-	@echo Build of w3 complete...
-
-xemacs-w3:	docomp.el $(OBJECTS)
+w3:	$(URLDIR) docomp.el $(OBJECTS)
 	@echo Build of w3 complete...
 
-all:	w3.info w3
+$(URLDIR):
+	@echo "Please install the URL package in $(URLDIR) first."
+	@/bin/false
+
+all:	w3.info w3 emacs
 
 install: all
-	@echo Installing in $(lispdir)
-	@( if [ ! -d $(lispdir) ]; then mkdir -p $(lispdir); fi )
-	@( if [ ! -d $(infodir) ]; then mkdir -p $(infodir); fi )
-	@( if [ ! -d $(confdir) ]; then mkdir -p $(confdir);  fi )
-	$(INSTALL) -m 644 $(SOURCES) $(OBJECTS) $(lispdir)
-	$(INSTALL) -m 644 $(EXTRAS) $(lispdir)
-	$(INSTALL) -m 644 w3.info* $(infodir)
-	$(INSTALL) -m 644 default.css $(confdir)/stylesheet
-	$(INSTALL) -m 644 html32.dsl $(confdir)/
+	@echo Installing in $(LISPDIR)
+	$(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)
+	URLDIR=$(URLDIR) $(EMACS) -batch -q -l docomp.el -f hack-dot-emacs \
+		 $(DOTEMACS) $(LISPDIR) $(URLDIR)
 
 clean:
 	$(RM) $(OBJECTS)
 
-check-custom:
-	@./custom-check $(EMACS)
-
 w3.info:	w3.txi
 	@$(MAKEINFO) w3.txi
 
@@ -97,7 +101,3 @@
 		w3.cps w3.fns w3.kys w3.pgs w3.tps w3.vrs	\
 		w3.log w3.toc w3.aux
 
-w3-vars.elc: w3-cus.el w3-vars.el
-w3-display.elc: w3-display.el css.el font.el w3-imap.el
-css.elc: css.el font.el
-w3.elc: css.el w3-vars.el w3.el