X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2FMakefile.in;h=d60d5b843f82f890fad293ac61a39abc649fd877;hb=1c2ed0ce5abe2181e51f777171f8cd40a547e5a9;hp=3d6f7f5372ba1d1f3343fd347169d720b9fd5644;hpb=dd2c57ddd13e84e2909950f05092fbc76515a57c;p=gnus

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 3d6f7f537..d60d5b843 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -12,9 +12,7 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 VPATH = @srcdir@
-W3DIR = @W3@
-URLDIR = @URL@
-EMACS_COMP = URLDIR="$(URLDIR)" W3DIR="$(W3DIR)" lispdir="$(lispdir)" srcdir=$(srcdir) $(EMACS) $(FLAGS)
+EMACS_COMP = lispdir="$(lispdir)" srcdir=$(srcdir) $(EMACS) $(FLAGS)
 
 all total: clean-some gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
@@ -35,38 +33,47 @@ clever some l: gnus-load.el
 
 install: install-el-elc list-installed-shadows
 
+# Test rules
+check:	test-registry test-nntp
+
+test-registry:
+	$(EMACS) $(FLAGS) -l ert -l gnus-registry.el -f ert-run-tests-batch-and-exit
+
+test-nntp:
+	$(EMACS) $(FLAGS) -l ert -l tests/gnustest-nntp.el -f ert-run-tests-batch-and-exit
+
 # This entry will never install .el files if there are no .elc files.
 install-el: gnus-load.el
-	$(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
-	$(INSTALL_DATA) gnus-load.el "$(lispdir)/gnus-load.el"
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
+	$(INSTALL_DATA) gnus-load.el "$(DESTDIR)$(lispdir)/gnus-load.el"
 	@for p in *.elc; do \
 	  p=`basename $$p c`; \
 	  if [ -f "$(srcdir)/$$p" ]; then \
-	    echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
-	    $(INSTALL_DATA) $(srcdir)/$$p "$(lispdir)/$$p"; \
+	    echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+	    $(INSTALL_DATA) $(srcdir)/$$p "$(DESTDIR)$(lispdir)/$$p"; \
 	  fi; \
 	done
 
 install-elc: clever
 	rm -f dgnushack.elc
-	$(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
 	@for p in *.elc; do \
-	  echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
-	  $(INSTALL_DATA) $$p "$(lispdir)/$$p"; \
+	  echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+	  $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; \
 	done
 
 install-el-elc: clever
 	rm -f dgnushack.elc
-	$(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
-	$(INSTALL_DATA) gnus-load.el "$(lispdir)/gnus-load.el"
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
+	$(INSTALL_DATA) gnus-load.el "$(DESTDIR)$(lispdir)/gnus-load.el"
 	@for p in *.elc; do \
 	  q=`basename $$p c`; \
 	  if [ -f "$(srcdir)/$$q" ]; then \
-	    echo "$(INSTALL_DATA) $$q \"$(lispdir)/$$q\""; \
-	    $(INSTALL_DATA) $(srcdir)/$$q "$(lispdir)/$$q"; \
+	    echo "$(INSTALL_DATA) $$q \"$(DESTDIR)$(lispdir)/$$q\""; \
+	    $(INSTALL_DATA) $(srcdir)/$$q "$(DESTDIR)$(lispdir)/$$q"; \
 	  fi; \
-	  echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
-	  $(INSTALL_DATA) $$p "$(lispdir)/$$p"; \
+	  echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+	  $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; \
 	done
 
 list-installed-shadows:
@@ -77,11 +84,11 @@ remove-installed-shadows:
 
 uninstall:
 	for p in *.elc; do \
-	  rm -f "$(lispdir)/$$p"; \
+	  rm -f "$(DESTDIR)$(lispdir)/$$p"; \
 	done
 	cd $(srcdir); \
 	for p in *.el; do \
-	  rm -f "$(lispdir)/$$p"; \
+	  rm -f "$(DESTDIR)$(lispdir)/$$p"; \
 	done
 
 tags: