replace $LOGDIR by /var/log
This commit is contained in:
		
							
								
								
									
										11
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								Makefile
									
									
									
									
									
								
							| @@ -3,9 +3,6 @@ PREFIX ?=         /usr/local | |||||||
| SYSCONFDIR ?=     /usr/local/etc | SYSCONFDIR ?=     /usr/local/etc | ||||||
| SYSTEMDUNITDIR ?= /usr/local/lib/systemd/system | SYSTEMDUNITDIR ?= /usr/local/lib/systemd/system | ||||||
|  |  | ||||||
| LOGDIR ?=           /var/log |  | ||||||
| LOGROTATECONFDIR ?= /etc/logrotate.d |  | ||||||
|  |  | ||||||
| BINDIR ?=  $(PREFIX)/bin | BINDIR ?=  $(PREFIX)/bin | ||||||
| SBINDIR ?= $(PREFIX)/sbin | SBINDIR ?= $(PREFIX)/sbin | ||||||
| DATADIR ?= $(PREFIX)/share | DATADIR ?= $(PREFIX)/share | ||||||
| @@ -60,8 +57,8 @@ base: | |||||||
| 	rm -fv nohang-desktop.conf | 	rm -fv nohang-desktop.conf | ||||||
| 	rm -fv version | 	rm -fv version | ||||||
|  |  | ||||||
| 	install -d $(DESTDIR)$(LOGROTATECONFDIR) | 	install -d $(DESTDIR)/etc/logrotate.d | ||||||
| 	install -m0644 conf/logrotate.d/nohang $(DESTDIR)$(LOGROTATECONFDIR)/nohang | 	install -m0644 conf/logrotate.d/nohang $(DESTDIR)/etc/logrotate.d/nohang | ||||||
|  |  | ||||||
| 	install -d $(DESTDIR)$(MANDIR)/man1 | 	install -d $(DESTDIR)$(MANDIR)/man1 | ||||||
| 	gzip -9cn man/oom-sort.1 > $(DESTDIR)$(MANDIR)/man1/oom-sort.1.gz | 	gzip -9cn man/oom-sort.1 > $(DESTDIR)$(MANDIR)/man1/oom-sort.1.gz | ||||||
| @@ -135,9 +132,9 @@ uninstall-base: | |||||||
|  |  | ||||||
| 	rm -fv $(DESTDIR)$(MANDIR)/man8/nohang.8.gz | 	rm -fv $(DESTDIR)$(MANDIR)/man8/nohang.8.gz | ||||||
|  |  | ||||||
| 	rm -fvr $(DESTDIR)$(LOGROTATECONFDIR)/nohang | 	rm -fvr $(DESTDIR)$/etc/logrotate.d/nohang | ||||||
| 	rm -fvr $(DESTDIR)$(DOCDIR)/ | 	rm -fvr $(DESTDIR)$(DOCDIR)/ | ||||||
| 	rm -fvr $(DESTDIR)$(LOGDIR)/nohang/ | 	rm -fvr $(DESTDIR)/var/log/nohang/ | ||||||
| 	rm -fvr $(DESTDIR)$(DATADIR)/nohang/ | 	rm -fvr $(DESTDIR)$(DATADIR)/nohang/ | ||||||
| 	rm -fvr $(DESTDIR)$(SYSCONFDIR)/nohang/ | 	rm -fvr $(DESTDIR)$(SYSCONFDIR)/nohang/ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -61,7 +61,7 @@ path to file with *default* nohang.conf values | |||||||
| #### $DATADIR/nohang/nohang-desktop.conf | #### $DATADIR/nohang/nohang-desktop.conf | ||||||
| path to file with *default* nohang-desktop.conf values | path to file with *default* nohang-desktop.conf values | ||||||
|  |  | ||||||
| #### $LOGDIR/nohang/nohang.log | #### /var/log/nohang/nohang.log | ||||||
| optional log file that stores entries if separate_log=True in the config | optional log file that stores entries if separate_log=True in the config | ||||||
|  |  | ||||||
| #### /etc/logrotate.d/nohang | #### /etc/logrotate.d/nohang | ||||||
|   | |||||||
| @@ -72,7 +72,7 @@ path to file with \f[I]default\f[] nohang.conf values | |||||||
| .SS $DATADIR/nohang/nohang\-desktop.conf | .SS $DATADIR/nohang/nohang\-desktop.conf | ||||||
| .PP | .PP | ||||||
| path to file with \f[I]default\f[] nohang\-desktop.conf values | path to file with \f[I]default\f[] nohang\-desktop.conf values | ||||||
| .SS $LOGDIR/nohang/nohang.log | .SS /var/log/nohang/nohang.log | ||||||
| .PP | .PP | ||||||
| optional log file that stores entries if separate_log=True in the config | optional log file that stores entries if separate_log=True in the config | ||||||
| .SS /etc/logrotate.d/nohang | .SS /etc/logrotate.d/nohang | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Alexey Avramov
					Alexey Avramov