Module: ngircd.git Branch: branch-21.x Commit: 19da9a0801407aa5e82ab205080a7b77979380e7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=19da9...

Author: Alexander Barton alex@barton.de Date: Mon Jul 14 10:55:57 2014 +0200

Debian: Correctly set and use "docdir"

(cherry picked from commit 06920df4bb88260aba7d5bf1c2000d2e521bab3e)

---

contrib/Debian/rules | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/contrib/Debian/rules b/contrib/Debian/rules index 4df0609..bb14b7f 100755 --- a/contrib/Debian/rules +++ b/contrib/Debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors +# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,6 +42,7 @@ configure-ngircd: configure --prefix=/usr \ --sysconfdir=/etc/ngircd \ --mandir=$${prefix}/share/man \ + --docdir=$${prefix}/share/doc/ngircd \ --with-syslog --with-zlib

configure-ngircd-full: configure @@ -52,6 +53,7 @@ configure-ngircd-full: configure --prefix=/usr \ --sysconfdir=/etc/ngircd \ --mandir=$${prefix}/share/man \ + --docdir=$${prefix}/share/doc/ngircd-full \ --with-syslog --with-zlib \ --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \ --with-pam \ @@ -65,6 +67,7 @@ configure-ngircd-full-dbg: configure --prefix=/usr \ --sysconfdir=/etc/ngircd \ --mandir=$${prefix}/share/man \ + --docdir=$${prefix}/share/doc/ngircd-full-dbg \ --enable-debug --enable-sniffer \ --with-syslog --with-zlib \ --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \ @@ -153,10 +156,8 @@ install-ngircd-full: build-ngircd-full

# Add here commands to install the "full" package into debian/ngircd-full: $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full - rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/INSTALL* - rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/COPYING* - mv $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd \ - $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full + rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/INSTALL* + rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/COPYING* mkdir -p $(CURDIR)/debian/ngircd-full/var/run/ircd cat $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/sample-ngircd.conf | \ sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \ @@ -176,10 +177,8 @@ install-ngircd-full-dbg: build-ngircd-full-dbg

# Add here commands to install the "full" package into debian/ngircd-full: $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full-dbg - rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/INSTALL* - rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/COPYING* - mv $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd \ - $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg + rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/INSTALL* + rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/COPYING* mkdir -p $(CURDIR)/debian/ngircd-full-dbg/var/run/ircd cat $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/sample-ngircd.conf | \ sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \