Hrvoje Niksic <[EMAIL PROTECTED]> writes:
> Note that in a "legal" build you'd never need to do that anyway. The
> feature is needed for anomalies like building RPM's, etc.
Most probably, you're right. But providing the DESTDIR feature
literally will help to avoid stupid packaging errors.
> But never mind; since the (latest) GNU standards require the thing,
> it's welcome to Wget.
Thanks! My copy coming with autoconf 2.13 doesn't mention it neither.
Patch appended -- I hope I've found all occurencies. I's arguable how
to deal with the "po" subdir. Maybe, you should better use the new file
from gettext 0.10.36 CVS at
:pserver:[EMAIL PROTECTED]:/cvs/gettext (it's up to you to
decide).
? doc/sample.wgetrc.munged_for_texi_inclusion
Index: doc/ChangeLog
===================================================================
RCS file: /pack/anoncvs/wget/doc/ChangeLog,v
retrieving revision 1.40
diff -u -u -r1.40 ChangeLog
--- doc/ChangeLog 2001/01/10 06:51:46 1.40
+++ doc/ChangeLog 2001/01/20 19:47:21
@@ -1,3 +1,8 @@
+2001-01-20 Karl Eichwalder <[EMAIL PROTECTED]>
+
+ * Makefile.in: Provide and use DESTDIR according to the Coding
+ Standards.
+
2001-01-09 Dan Harkless <[EMAIL PROTECTED]>
* wget.texi: Did a bunch of clarification and correction to the
Index: doc/Makefile.in
===================================================================
RCS file: /pack/anoncvs/wget/doc/Makefile.in,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile.in
--- doc/Makefile.in 2000/12/31 11:50:52 1.7
+++ doc/Makefile.in 2001/01/20 19:47:22
@@ -40,6 +40,8 @@
manext = 1
sysconfdir = @sysconfdir@
+DESTDIR =
+
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
RM = rm -f
@@ -90,45 +92,45 @@
# install info pages, creating install directory if necessary
install.info: wget.info
- $(top_srcdir)/mkinstalldirs $(infodir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
-for file in wget.info wget.info-*[0-9]; do \
- test -f $$file && $(INSTALL_DATA) $$file $(infodir)/$$file ; \
+ test -f $$file && $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file ; \
done
# install man page, creating install directory if necessary
#install.man:
-# $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext)
-# $(INSTALL_DATA) $(srcdir)/$(MAN) $(mandir)/man$(manext)/$(MAN)
+# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext)
+# $(INSTALL_DATA) $(srcdir)/$(MAN) $(DESTDIR)$(mandir)/man$(manext)/$(MAN)
# install sample.wgetrc
install.wgetrc:
- $(top_srcdir)/mkinstalldirs $(sysconfdir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
@if test -f $(WGETRC); then \
- if cmp -s $(srcdir)/sample.wgetrc $(WGETRC); then echo ""; \
+ if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ""; \
else \
- echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new'; \
- $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new; \
+ echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC).new'; \
+ $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC).new; \
echo; \
- echo "WARNING: Differing \`$(WGETRC)'"; \
+ echo "WARNING: Differing \`$(DESTDIR)$(WGETRC)'"; \
echo " exists and has been spared. You might want to"; \
echo " consider merging in the new lines from"; \
- echo " \`$(WGETRC).new'."; \
+ echo " \`$(DESTDIR)$(WGETRC).new'."; \
echo; \
echo "<Hit RETURN to acknowledge>\c"; \
read user_input; \
echo; \
fi; \
else \
- $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC); \
+ $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); \
fi
# uninstall info pages
uninstall.info:
- $(RM) $(infodir)/wget.info*
+ $(RM) $(DESTDIR)$(infodir)/wget.info*
# uninstall man page
#uninstall.man:
-# $(RM) $(mandir)/man$(manext)/$(MAN)
+# $(RM) $(DESTDIR)$(mandir)/man$(manext)/$(MAN)
#
# Dependencies for cleanup
Index: po/Makefile.in.in
===================================================================
RCS file: /pack/anoncvs/wget/po/Makefile.in.in,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.in.in
--- po/Makefile.in.in 2001/01/15 23:55:48 1.2
+++ po/Makefile.in.in 2001/01/20 19:47:22
@@ -24,6 +24,8 @@
gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
+DESTDIR =
+
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -92,8 +94,8 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
+ *) destdir=$(DESTDIR)$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
@@ -135,10 +137,12 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+ rm -f $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ dir=$(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES; \
+ rm -f $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
done
rm -f $(gettextsrcdir)/po-Makefile.in.in
Index: src/ChangeLog
===================================================================
RCS file: /pack/anoncvs/wget/src/ChangeLog,v
retrieving revision 1.112
diff -u -u -r1.112 ChangeLog
--- src/ChangeLog 2001/01/11 06:16:46 1.112
+++ src/ChangeLog 2001/01/20 19:47:27
@@ -1,3 +1,8 @@
+2001-01-20 Karl Eichwalder <[EMAIL PROTECTED]>
+
+ * Makefile.in: Provide and use DESTDIR according to the Coding
+ Standards.
+
2001-01-10 Dan Harkless <[EMAIL PROTECTED]>
* url.c (str_url): Clarified this function's comment header after
Index: src/Makefile.in
===================================================================
RCS file: /pack/anoncvs/wget/src/Makefile.in,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile.in
--- src/Makefile.in 2000/12/05 23:09:37 1.6
+++ src/Makefile.in 2001/01/20 19:47:27
@@ -33,6 +33,8 @@
sysconfdir = @sysconfdir@
localedir = $(prefix)/share/locale
+DESTDIR =
+
CC = @CC@
CPPFLAGS = @CPPFLAGS@
# The following line is losing on some versions of make!
@@ -102,11 +104,11 @@
uninstall: uninstall.bin
install.bin: wget$(exeext)
- $(top_srcdir)/mkinstalldirs $(bindir)
- $(INSTALL_PROGRAM) wget$(exeext) $(bindir)/wget$(exeext)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) wget$(exeext) $(DESTDIR)$(bindir)/wget$(exeext)
uninstall.bin:
- $(RM) $(bindir)/wget$(exeext)
+ $(RM) $(DESTDIR)$(bindir)/wget$(exeext)
#
# Dependencies for cleanup
--
work : [EMAIL PROTECTED] | ,__o
: http://www.suse.de/~ke/ | _-\_<,
home : [EMAIL PROTECTED] | (*)/'(*)
