SOURCES: siege-DESTDIR.patch - fix installment of urls and siegerc...

[glen]

Author: glen                         Date: Wed Aug 17 12:07:00 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix installment of urls and siegerc
- note siegerc is installed to /etc/siegerc, not $HOME. it's not used (by the program), but useful perhaps in the future?

---- Files affected:
SOURCES:
   siege-DESTDIR.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/siege-DESTDIR.patch
diff -u SOURCES/siege-DESTDIR.patch:1.1 SOURCES/siege-DESTDIR.patch:1.2
--- SOURCES/siege-DESTDIR.patch:1.1	Sun May  5 11:38:08 2002
+++ SOURCES/siege-DESTDIR.patch	Wed Aug 17 14:06:55 2005
@@ -10,3 +10,52 @@
  	fi 
  
  
+--- ./doc/Makefile.am~	2005-08-17 14:26:13.000000000 +0300
++++ ./doc/Makefile.am	2005-08-17 14:51:01.000000000 +0300
+@@ -47,11 +47,11 @@
+ URLSTXT           =      $(sysconfdir)/urls.txt
+ 
+ install-exec-hook: 
+-	@if test -f $(SIEGERC); then \
+-	  if cmp -s $(srcdir)/siegerc $(SIEGERC); then echo ""; \
++	@if test -f $(DESTDIR)$(SIEGERC); then \
++	  if cmp -s $(srcdir)/siegerc $(DESTDIR)$(SIEGERC); then echo ""; \
+ 	    else \
+ 	    echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \
+-	    $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new; \
++	    $(INSTALL_DATA) $(srcdir)/siegerc $(DESTDIR)$(SIEGERC).new; \
+ 	    echo "#####################################################"; \
+ 	    echo "WARNING: File $(SIEGERC) already exists."; \
+ 	    echo "         A new resource file has been installed as"; \
+@@ -61,16 +61,16 @@
+ 	    echo "#####################################################"; \
+ 	  fi; \
+ 	else \
+-	  $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC); \
++	  $(INSTALL_DATA) $(srcdir)/siegerc $(DESTDIR)$(SIEGERC); \
+ 	fi 
+-	@if test -f $(URLSTXT); then \
+-	  if cmp -s $(srcdir)/siegerc $(URLSTXT); then echo ""; \
++	@if test -f $(DESTDIR)$(URLSTXT); then \
++	  if cmp -s $(srcdir)/siegerc $(DESTDIR)$(URLSTXT); then echo ""; \
+ 	    else \
+ 	    echo "WARNING: File $(URLSTXT) already exists."; \
+ 	    echo "         It was NOT replaced with this installation."; \
+ 	  fi; \
+ 	else \
+-	  $(mkinstalldirs) $(sysconfdir); \
++	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
+ 	  $(INSTALL_DATA) $(srcdir)/urls.txt $(DESTDIR)$(URLSTXT); \
+ 	fi 
+ 
+--- ./doc/Makefile.am~	2005-08-17 14:51:43.000000000 +0300
++++ ./doc/Makefile.am	2005-08-17 14:53:23.000000000 +0300
+@@ -42,7 +42,7 @@
+ 
+ DISTCLEANFILES    =      siegerc $(man_MANS)
+ 
+-SIEGERC           =      $(HOME)/.siegerc
++SIEGERC           =      $(sysconfdir)/siegerc
+ 
+ URLSTXT           =      $(sysconfdir)/urls.txt
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/siege-DESTDIR.patch?r1=1.1&r2=1.2&f=u