X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2FMakefile.in;h=a64531543cf73fff2f19cf5b5554c204e71d582b;hb=6c74b53e357ecec4f6e48c1dbba4d60129d874dc;hp=15e7340b23bbf33413d4125eddfa2aff56644fed;hpb=bfa35c713375c6d0cf4a01cd159805ff3aac4d15;p=gnus

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 15e7340b2..a64531543 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,6 +1,7 @@
+prefix = @prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 lispdir = @lispdir@
-prefix = @prefix@
 srcdir = @srcdir@
 subdir = lisp
 top_srcdir = @top_srcdir@
@@ -13,7 +14,7 @@ SHELL = /bin/sh
 VPATH = @srcdir@
 W3DIR = @W3@
 URLDIR = @URL@
-EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir) $(EMACS) $(FLAGS)
+EMACS_COMP = URLDIR="$(URLDIR)" W3DIR="$(W3DIR)" lispdir="$(lispdir)" srcdir=$(srcdir) $(EMACS) $(FLAGS)
 
 all total: clean-some gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
@@ -24,6 +25,9 @@ clean-some:
 warn: clean-some gnus-load.el
 	$(EMACS_COMP) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
 
+fail-on-warning: clean-some gnus-load.el
+	$(EMACS_COMP) -f dgnushack-compile-error-on-warn
+
 # The "clever" rule is unsafe, since redefined macros are loaded from
 # .elc files, and not the .el file.
 clever some l: gnus-load.el
@@ -31,40 +35,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)
-	echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
-	$(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
-	for p in *.elc; do \
+	$(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)
-	for p in *.elc; do \
-	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
-	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
+	@for p in *.elc; do \
+	  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)
-	echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
-	$(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
-	for p in *.elc; do \
+	$(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:
@@ -75,11 +86,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:
@@ -96,8 +107,11 @@ gnus-load.el:
 	$(EMACS_COMP) -f dgnushack-make-auto-load $(srcdir)
 	$(EMACS_COMP) -f dgnushack-make-load
 
-distclean:
-	rm -f *.orig *.rej *.elc auto-autoloads.* custom-load.* *~ Makefile
+clean:
+	rm -f *.elc *.orig *.rej *~ auto-autoloads.* custom-load.* gnus-load.el
+
+distclean: clean
+	rm -f Makefile
 
 Makefile: $(srcdir)/Makefile.in ../config.status
 	cd .. \