diff -urN siege-2.53.org/doc/Makefile.am siege-2.53/doc/Makefile.am --- siege-2.53.org/doc/Makefile.am Mon Mar 18 22:19:00 2002 +++ siege-2.53/doc/Makefile.am Sun May 5 10:40:30 2002 @@ -71,7 +71,7 @@ fi; \ else \ $(mkinstalldirs) $(sysconfdir); \ - $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \ + $(INSTALL_DATA) $(srcdir)/urls.txt $(DESTDIR)$(URLSTXT); \ 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 --- ./doc/Makefile.am.orig 2008-06-05 08:03:14 +0400 +++ ./doc/Makefile.am 2008-06-05 08:16:16 +0400 @@ -42,11 +42,12 @@ siegerc.in DISTCLEANFILES = siegerc $(man_MANS) -SIEGERC = $(sysconfdir)/siegerc +SIEGERC = $(sysconfdir)/siege/siegerc -URLSTXT = $(sysconfdir)/urls.txt +URLSTXT = $(sysconfdir)/siege/urls.txt install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/siege @if test -f $(DESTDIR)$(SIEGERC); then \ if cmp -s $(srcdir)/siegerc $(DESTDIR)$(SIEGERC); then echo ""; \ else \ @@ -70,7 +71,6 @@ install-exec-hook: echo " It was NOT replaced with this installation."; \ fi; \ else \ - $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \ $(INSTALL_DATA) $(srcdir)/urls.txt $(DESTDIR)$(URLSTXT); \ fi