mirror of
				https://github.com/osmarks/ngircd.git
				synced 2025-10-31 22:13:00 +00:00 
			
		
		
		
	Debian: Correctly set and use "docdir"
(cherry picked from commit 06920df4bb)
			
			
This commit is contained in:
		| @@ -1,7 +1,7 @@ | |||||||
| #!/usr/bin/make -f | #!/usr/bin/make -f | ||||||
| # | # | ||||||
| # ngIRCd -- The Next Generation IRC Daemon | # 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 | # 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 | # it under the terms of the GNU General Public License as published by | ||||||
| @@ -42,6 +42,7 @@ configure-ngircd: configure | |||||||
| 	  --prefix=/usr \ | 	  --prefix=/usr \ | ||||||
| 	  --sysconfdir=/etc/ngircd \ | 	  --sysconfdir=/etc/ngircd \ | ||||||
| 	  --mandir=\$${prefix}/share/man \ | 	  --mandir=\$${prefix}/share/man \ | ||||||
|  | 	  --docdir=\$${prefix}/share/doc/ngircd \ | ||||||
| 	  --with-syslog --with-zlib | 	  --with-syslog --with-zlib | ||||||
|  |  | ||||||
| configure-ngircd-full: configure | configure-ngircd-full: configure | ||||||
| @@ -52,6 +53,7 @@ configure-ngircd-full: configure | |||||||
| 	  --prefix=/usr \ | 	  --prefix=/usr \ | ||||||
| 	  --sysconfdir=/etc/ngircd \ | 	  --sysconfdir=/etc/ngircd \ | ||||||
| 	  --mandir=\$${prefix}/share/man \ | 	  --mandir=\$${prefix}/share/man \ | ||||||
|  | 	  --docdir=\$${prefix}/share/doc/ngircd-full \ | ||||||
| 	  --with-syslog --with-zlib \ | 	  --with-syslog --with-zlib \ | ||||||
| 	  --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \ | 	  --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \ | ||||||
| 	  --with-pam \ | 	  --with-pam \ | ||||||
| @@ -65,6 +67,7 @@ configure-ngircd-full-dbg: configure | |||||||
| 	  --prefix=/usr \ | 	  --prefix=/usr \ | ||||||
| 	  --sysconfdir=/etc/ngircd \ | 	  --sysconfdir=/etc/ngircd \ | ||||||
| 	  --mandir=\$${prefix}/share/man \ | 	  --mandir=\$${prefix}/share/man \ | ||||||
|  | 	  --docdir=\$${prefix}/share/doc/ngircd-full-dbg \ | ||||||
| 	  --enable-debug --enable-sniffer \ | 	  --enable-debug --enable-sniffer \ | ||||||
| 	  --with-syslog --with-zlib \ | 	  --with-syslog --with-zlib \ | ||||||
| 	  --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \ | 	  --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: | 	# Add here commands to install the "full" package into debian/ngircd-full: | ||||||
| 	$(MAKE) install DESTDIR=$(CURDIR)/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-full/INSTALL* | ||||||
| 	rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/COPYING* | 	rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/COPYING* | ||||||
| 	mv $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd \ |  | ||||||
| 	 $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full |  | ||||||
| 	mkdir -p $(CURDIR)/debian/ngircd-full/var/run/ircd | 	mkdir -p $(CURDIR)/debian/ngircd-full/var/run/ircd | ||||||
| 	cat $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/sample-ngircd.conf | \ | 	cat $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/sample-ngircd.conf | \ | ||||||
| 	 sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \ | 	 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: | 	# Add here commands to install the "full" package into debian/ngircd-full: | ||||||
| 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full-dbg | 	$(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-full-dbg/INSTALL* | ||||||
| 	rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/COPYING* | 	rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/COPYING* | ||||||
| 	mv $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd \ |  | ||||||
| 	 $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg |  | ||||||
| 	mkdir -p $(CURDIR)/debian/ngircd-full-dbg/var/run/ircd | 	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 | \ | 	cat $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/sample-ngircd.conf | \ | ||||||
| 	 sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \ | 	 sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Alexander Barton
					Alexander Barton