diff options
| author | Elan Ruusamäe | 2005-08-17 12:06:55 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 672553a9ee44a3ee800359d58ddfdc3a3fbb7db4 (patch) | |
| tree | c91d731550f63581a7b5771fc3d5f536c2d56bee | |
| parent | 30b2b377e5471d12e70eed2a9c4f0411aa3f930c (diff) | |
| download | siege-672553a9ee44a3ee800359d58ddfdc3a3fbb7db4.zip siege-672553a9ee44a3ee800359d58ddfdc3a3fbb7db4.tar.gz | |
- 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?
Changed files:
siege-DESTDIR.patch -> 1.2
| -rw-r--r-- | siege-DESTDIR.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/siege-DESTDIR.patch b/siege-DESTDIR.patch index 923fd13..0128ad0 100644 --- a/siege-DESTDIR.patch +++ b/siege-DESTDIR.patch @@ -10,3 +10,52 @@ diff -urN siege-2.53.org/doc/Makefile.am siege-2.53/doc/Makefile.am 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 + |