[packages/emacsen-gnus-pkg.git] / emacsen-gnus-pkg-destdir.patch

diff -ur gnus-5.10.6-vanilla/Makefile.in gnus-5.10.6/Makefile.in
--- gnus-5.10.6-vanilla/Makefile.in	2003-04-16 23:56:17.000000000 +0200
+++ gnus-5.10.6/Makefile.in	2004-04-22 17:07:38.306066856 +0200
@@ -7,15 +7,17 @@
 EMACS = @EMACS@
 XEMACS = @EMACS@
 
+DESTDIR =
+
 all: lick info
 
 lick:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
 
 install:
-	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
-	cd texi && $(MAKE) EMACS="$(EMACS)" install
-	cd etc && $(MAKE) EMACS="$(EMACS)" install
+	cd lisp && $(MAKE) DESTDIR="$(DESTDIR)" EMACS="$(EMACS)" lispdir="$(lispdir)" install
+	cd texi && $(MAKE) DESTDIR="$(DESTDIR)" EMACS="$(EMACS)" install
+	cd etc && $(MAKE) DESTDIR="$(DESTDIR)" EMACS="$(EMACS)" install
 
 uninstall:
 	cd lisp && $(MAKE) lispdir="$(lispdir)" uninstall
diff -ur gnus-5.10.6-vanilla/etc/Makefile.in gnus-5.10.6/etc/Makefile.in
--- gnus-5.10.6-vanilla/etc/Makefile.in	2003-02-01 17:40:40.000000000 +0100
+++ gnus-5.10.6/etc/Makefile.in	2004-04-22 17:17:11.811880720 +0200
@@ -13,24 +13,26 @@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 
+DESTDIR =
+
 install:
-	$(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)"
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)"
 	@cd $(srcdir) \
 	&& for p in gnus-tut.txt; do \
-	  echo "$(INSTALL_DATA) $$p \"$(etcdir)/$$p\""; \
-	  $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
+	  echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(etcdir)/$$p\""; \
+	  $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
 	done
-	$(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)/images/gnus"
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)/images/gnus"
 	@cd $(srcdir) \
 	&& for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
-	  echo "$(INSTALL_DATA) $$p \"$(etcdir)/$$p\""; \
-	  $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
+	  echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(etcdir)/$$p\""; \
+	  $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
 	done
-	$(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)/images/smilies"
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)/images/smilies"
 	@cd $(srcdir) \
 	&& for p in images/smilies/*.pbm images/smilies/*.xpm; do \
-	  echo "$(INSTALL_DATA) $$p \"$(etcdir)/$$p\""; \
-	  $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
+	  echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(etcdir)/$$p\""; \
+	  $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
 	done
 
 uninstall: 
diff -ur gnus-5.10.6-vanilla/lisp/Makefile.in gnus-5.10.6/lisp/Makefile.in
--- gnus-5.10.6-vanilla/lisp/Makefile.in	2003-10-25 00:10:24.000000000 +0200
+++ gnus-5.10.6/lisp/Makefile.in	2004-04-22 17:08:46.452706992 +0200
@@ -15,6 +15,8 @@
 URLDIR = @URL@
 EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir="$(lispdir)" srcdir=$(srcdir) $(EMACS) $(FLAGS)
 
+DESTDIR =
+
 all total: clean-some gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
 
@@ -32,36 +34,36 @@
 
 # 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:
diff -ur gnus-5.10.6-vanilla/texi/Makefile.in gnus-5.10.6/texi/Makefile.in
--- gnus-5.10.6-vanilla/texi/Makefile.in	2003-10-18 15:08:27.000000000 +0200
+++ gnus-5.10.6/texi/Makefile.in	2004-04-22 17:15:56.217372832 +0200
@@ -20,6 +20,8 @@
 REFCARD=gnus-refcard
 LOGO=gnus-logo
 
+DESTDIR =
+
 all: $(INFO_DEPS)
 
 most: texi2latex.elc latex latexps
@@ -181,21 +183,21 @@
 	rm -f gnusconfig.tex
 
 install: $(INFO_DEPS)
-	$(SHELL) $(top_srcdir)/mkinstalldirs "$(infodir)"
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(infodir)"
 	@list='$(INFO_DEPS)'; \
 	for file in $$list; do \
 	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 	    if test -f $$ifile; then \
-	      echo "$(INSTALL_DATA) $$ifile \"$(infodir)/$$ifile\""; \
-	      $(INSTALL_DATA) $$ifile "$(infodir)/$$ifile"; \
+	      echo "$(INSTALL_DATA) $$ifile \"$(DESTDIR)$(infodir)/$$ifile\""; \
+	      $(INSTALL_DATA) $$ifile "$(DESTDIR)$(infodir)/$$ifile"; \
 	    else : ; fi; \
 	  done; \
 	done
 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
-	    echo "install-info --info-dir=\"$(infodir)\" \"$(infodir)/$$file\"";\
-	    install-info --info-dir="$(infodir)" "$(infodir)/$$file" || :;\
+	    echo "install-info --info-dir=\"$(infodir)\" \"$(DESTDIR)$(infodir)/$$file\"";\
+	    install-info --info-dir="$(infodir)" "$(DESTDIR)$(infodir)/$$file" || :;\
 	  done; \
 	else : ; fi
Commit	Line	Data
8002e784	1	diff -ur gnus-5.10.6-vanilla/Makefile.in gnus-5.10.6/Makefile.in
	2	--- gnus-5.10.6-vanilla/Makefile.in 2003-04-16 23:56:17.000000000 +0200
	3	+++ gnus-5.10.6/Makefile.in 2004-04-22 17:07:38.306066856 +0200
	4	@@ -7,15 +7,17 @@
	5	EMACS = @EMACS@
	6	XEMACS = @EMACS@
	7
	8	+DESTDIR =
	9	+
	10	all: lick info
	11
	12	lick:
	13	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
	14
	15	install:
	16	- cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
	17	- cd texi && $(MAKE) EMACS="$(EMACS)" install
	18	- cd etc && $(MAKE) EMACS="$(EMACS)" install
	19	+ cd lisp && $(MAKE) DESTDIR="$(DESTDIR)" EMACS="$(EMACS)" lispdir="$(lispdir)" install
	20	+ cd texi && $(MAKE) DESTDIR="$(DESTDIR)" EMACS="$(EMACS)" install
	21	+ cd etc && $(MAKE) DESTDIR="$(DESTDIR)" EMACS="$(EMACS)" install
	22
	23	uninstall:
	24	cd lisp && $(MAKE) lispdir="$(lispdir)" uninstall
	25	diff -ur gnus-5.10.6-vanilla/etc/Makefile.in gnus-5.10.6/etc/Makefile.in
	26	--- gnus-5.10.6-vanilla/etc/Makefile.in 2003-02-01 17:40:40.000000000 +0100
	27	+++ gnus-5.10.6/etc/Makefile.in 2004-04-22 17:17:11.811880720 +0200
6a32cff6	28	@@ -13,24 +13,26 @@
8002e784	29	INSTALL_DATA = @INSTALL_DATA@
	30	SHELL = /bin/sh
	31
	32	+DESTDIR =
	33	+
6a32cff6 JR	34	install:
	35	- $(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)"
	36	+ $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)"
	37	@cd $(srcdir) \
8002e784	38	&& for p in gnus-tut.txt; do \
6a32cff6 JR	39	- echo "$(INSTALL_DATA) $$p \"$(etcdir)/$$p\""; \
	40	- $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
	41	+ echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(etcdir)/$$p\""; \
	42	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
8002e784	43	done
6a32cff6 JR	44	- $(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)/images/gnus"
	45	+ $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)/images/gnus"
	46	@cd $(srcdir) \
	47	&& for p in images/gnus/.xpm images/gnus/.pbm images/gnus/*.xbm images/gnus/x-splash; do \
	48	- echo "$(INSTALL_DATA) $$p \"$(etcdir)/$$p\""; \
	49	- $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
	50	+ echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(etcdir)/$$p\""; \
	51	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
8002e784	52	done
6a32cff6 JR	53	- $(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)/images/smilies"
	54	+ $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)/images/smilies"
	55	@cd $(srcdir) \
	56	&& for p in images/smilies/.pbm images/smilies/.xpm; do \
	57	- echo "$(INSTALL_DATA) $$p \"$(etcdir)/$$p\""; \
	58	- $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
	59	+ echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(etcdir)/$$p\""; \
	60	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
8002e784	61	done
	62
	63	uninstall:
	64	diff -ur gnus-5.10.6-vanilla/lisp/Makefile.in gnus-5.10.6/lisp/Makefile.in
	65	--- gnus-5.10.6-vanilla/lisp/Makefile.in 2003-10-25 00:10:24.000000000 +0200
	66	+++ gnus-5.10.6/lisp/Makefile.in 2004-04-22 17:08:46.452706992 +0200
	67	@@ -15,6 +15,8 @@
	68	URLDIR = @URL@
6a32cff6	69	EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir="$(lispdir)" srcdir=$(srcdir) $(EMACS) $(FLAGS)
8002e784	70
	71	+DESTDIR =
	72	+
	73	all total: clean-some gnus-load.el
	74	$(EMACS_COMP) -f dgnushack-compile
	75
6a32cff6	76	@@ -32,36 +34,36 @@
8002e784	77
6a32cff6	78	# This entry will never install .el files if there are no .elc files.
8002e784	79	install-el: gnus-load.el
6a32cff6 JR	80	- $(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
	81	- $(INSTALL_DATA) gnus-load.el "$(lispdir)/gnus-load.el"
	82	+ $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
	83	+ $(INSTALL_DATA) gnus-load.el "$(DESTDIR)$(lispdir)/gnus-load.el"
	84	@for p in *.elc; do \
8002e784	85	p=`basename $$p c`; \
8002e784	86	if [ -f "$(srcdir)/$$p" ]; then \
6a32cff6 JR	87	- echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
	88	- $(INSTALL_DATA) $(srcdir)/$$p "$(lispdir)/$$p"; \
	89	+ echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
	90	+ $(INSTALL_DATA) $(srcdir)/$$p "$(DESTDIR)$(lispdir)/$$p"; \
8002e784	91	fi; \
	92	done
	93
	94	install-elc: clever
	95	rm -f dgnushack.elc
6a32cff6 JR	96	- $(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
	97	+ $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
	98	@for p in *.elc; do \
	99	- echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
	100	- $(INSTALL_DATA) $$p "$(lispdir)/$$p"; \
	101	+ echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
	102	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; \
8002e784	103	done
8002e784	104
6a32cff6 JR	105	install-el-elc: clever
	106	rm -f dgnushack.elc
	107	- $(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
	108	- $(INSTALL_DATA) gnus-load.el "$(lispdir)/gnus-load.el"
	109	+ $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
	110	+ $(INSTALL_DATA) gnus-load.el "$(DESTDIR)$(lispdir)/gnus-load.el"
	111	@for p in *.elc; do \
	112	q=`basename $$p c`; \
	113	if [ -f "$(srcdir)/$$q" ]; then \
	114	- echo "$(INSTALL_DATA) $$q \"$(lispdir)/$$q\""; \
	115	- $(INSTALL_DATA) $(srcdir)/$$q "$(lispdir)/$$q"; \
	116	+ echo "$(INSTALL_DATA) $$q \"$(DESTDIR)$(lispdir)/$$q\""; \
	117	+ $(INSTALL_DATA) $(srcdir)/$$q "$(DESTDIR)$(lispdir)/$$q"; \
	118	fi; \
	119	- echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
	120	- $(INSTALL_DATA) $$p "$(lispdir)/$$p"; \
	121	+ echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
	122	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; \
	123	done
	124
	125	list-installed-shadows:
8002e784	126	diff -ur gnus-5.10.6-vanilla/texi/Makefile.in gnus-5.10.6/texi/Makefile.in
	127	--- gnus-5.10.6-vanilla/texi/Makefile.in 2003-10-18 15:08:27.000000000 +0200
	128	+++ gnus-5.10.6/texi/Makefile.in 2004-04-22 17:15:56.217372832 +0200
	129	@@ -20,6 +20,8 @@
6a32cff6 JR	130	REFCARD=gnus-refcard
6a32cff6 JR	131	LOGO=gnus-logo
8002e784	132
	133	+DESTDIR =
	134	+
	135	all: $(INFO_DEPS)
	136
	137	most: texi2latex.elc latex latexps
6a32cff6	138	@@ -181,21 +183,21 @@
8002e784	139	rm -f gnusconfig.tex
	140
	141	install: $(INFO_DEPS)
6a32cff6 JR	142	- $(SHELL) $(top_srcdir)/mkinstalldirs "$(infodir)"
6a32cff6 JR	143	+ $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(infodir)"
8002e784	144	@list='$(INFO_DEPS)'; \
	145	for file in $$list; do \
	146	for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
	147	if test -f $$ifile; then \
6a32cff6 JR	148	- echo "$(INSTALL_DATA) $$ifile \"$(infodir)/$$ifile\""; \
	149	- $(INSTALL_DATA) $$ifile "$(infodir)/$$ifile"; \
	150	+ echo "$(INSTALL_DATA) $$ifile \"$(DESTDIR)$(infodir)/$$ifile\""; \
	151	+ $(INSTALL_DATA) $$ifile "$(DESTDIR)$(infodir)/$$ifile"; \
8002e784	152	else : ; fi; \
	153	done; \
	154	done
6a32cff6 JR	155	@if $(SHELL) -c 'install-info --version \| sed 1q \| fgrep -s -v -i debian' >/dev/null 2>&1; then \
	156	list='$(INFO_DEPS)'; \
	157	for file in $$list; do \
	158	- echo "install-info --info-dir=\"$(infodir)\" \"$(infodir)/$$file\"";\
	159	- install-info --info-dir="$(infodir)" "$(infodir)/$$file" \|\| :;\
	160	+ echo "install-info --info-dir=\"$(infodir)\" \"$(DESTDIR)$(infodir)/$$file\"";\
	161	+ install-info --info-dir="$(infodir)" "$(DESTDIR)$(infodir)/$$file" \|\| :;\
	162	done; \
	163	else : ; fi
	164