From bd3cda801449f0ed0630637a843d8d9d6a964daa Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 22 Feb 2026 13:47:21 +0100 Subject: m fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 78 ++++++++++++++++++++++++++++------------------------------------ 1 file changed, 34 insertions(+), 44 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 87994f1..ac8b396 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ BIN = /bin BINDIR = $(PREFIX)$(BIN) DATA = /share VARDIR = /var -LOGDIR = $(DEVDIR)/log +LOGDIR = $(VARDIR)/log DATADIR = $(PREFIX)$(DATA) DOCDIR = $(DATADIR)/doc INFODIR = $(DATADIR)/info @@ -16,20 +16,12 @@ LICENSEDIR = $(DATADIR)/licenses PKGNAME = cerberus-logging +TEXI2DVI = texi2dvi +CC = gcc -std=gnu99 -OPTIMISE = -Os -STD = -std=gnu99 -WARN = -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self -Wmissing-include-dirs \ - -Wtrampolines -Wfloat-equal -Wshadow -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs -Winline -Wno-variadic-macros -Wsync-nand \ - -Wunsafe-loop-optimizations -Wcast-align -Wstrict-overflow -Wdeclaration-after-statement \ - -Wundef -Wbad-function-cast -Wcast-qual -Wwrite-strings -Wlogical-op -Waggregate-return \ - -Wstrict-prototypes -Wold-style-definition -Wpacked -Wvector-operation-performance \ - -Wunsuffixed-float-constants -Wsuggest-attribute=const -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wsuggest-attribute=format -Wnormalized=nfkc -Wconversion \ - -fstrict-aliasing -fstrict-overflow -fipa-pure-const -ftree-vrp -fstack-usage \ - -funsafe-loop-optimizations -pedantic -DEFS = -D'LOGDIR="$(LOGDIR)"' +CPPFLAGS = -D'LOGDIR="$(LOGDIR)"' +CFLAGS = -Os +LDFLAGS = SYSTEMS = btmp utmp lastlog syslog audit DEFAULT_SYSTEMS = utmp @@ -56,11 +48,11 @@ audit: bin/log-login-audit bin/log-login-%: obj/log-login-%.o obj/common.o @mkdir -p bin - $(CC) $(STD) $(OPTIMISE) $(WARN) $(L_$*) $(LDFLAGS) -o $@ $^ + $(CC) -o $@ $^ $(L_$*) $(LDFLAGS) obj/%.o: src/%.c src/*.h @mkdir -p obj - $(CC) $(STD) $(OPTIMISE) $(WARN) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + $(CC) -c -o $@ $< $(CPPFLAGS) $(CFLAGS) .PHONY: doc doc: info pdf ps dvi @@ -74,21 +66,21 @@ info: cerberus-logging.info pdf: cerberus-logging.pdf %.pdf: info/%.texinfo info/fdl.texinfo @mkdir -p obj/pdf - cd obj/pdf ; yes X | texi2pdf ../../$< + cd obj/pdf && texi2pdf ../../$< < /dev/null mv obj/pdf/$@ $@ .PHONY: dvi dvi: cerberus-logging.dvi %.dvi: info/%.texinfo info/fdl.texinfo @mkdir -p obj/dvi - cd obj/dvi ; yes X | $(TEXI2DVI) ../../$< + cd obj/dvi && $(TEXI2DVI) ../../$< < /dev/null mv obj/dvi/$@ $@ .PHONY: ps ps: cerberus-logging.ps %.ps: info/%.texinfo info/fdl.texinfo @mkdir -p obj/ps - cd obj/ps ; yes X | texi2pdf --ps ../../$< + cd obj/ps && texi2pdf --ps ../../$< < /dev/null mv obj/ps/$@ $@ @@ -103,13 +95,13 @@ install-base: install-logging install-license .PHONY: install-logging install-logging: - install -dm755 -- "$(DESTDIR)$(DATADIR)/$(PKGNAME)" - install -m755 -- src/logging "$(DESTDIR)$(DATADIR)/$(PKGNAME)/logging" + mkdir -p -- "$(DESTDIR)$(DATADIR)/$(PKGNAME)" + cp -- src/logging "$(DESTDIR)$(DATADIR)/$(PKGNAME)/logging" .PHONY: install-license install-license: - install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" - install -m644 -- COPYING LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" + mkdir -p -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" + cp -- COPYING LICENSE "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" .PHONY: install-systems install-systems: $(foreach S,$(SYSTEMS),install-$(S)) @@ -119,51 +111,51 @@ install-default-systems: $(foreach S,$(DEFAULT_SYSTEMS),install-$(S)) .PHONY: install-btmp install-btmp: bin/log-login-btmp - install -dm755 -- "$(DESTDIR)$(BINDIR)" - install $< -- "$(DESTDIR)$(BINDIR)/log-login-btmp" + mkdir -p -- "$(DESTDIR)$(BINDIR)" + cp -- bin/log-login-btmp "$(DESTDIR)$(BINDIR)/log-login-btmp" .PHONY: install-utmp install-utmp: bin/log-login-utmp - install -dm755 -- "$(DESTDIR)$(BINDIR)" - install $< -- "$(DESTDIR)$(BINDIR)/log-login-utmp" + mkdir -p -- "$(DESTDIR)$(BINDIR)" + cp -- bin/log-login-utmp "$(DESTDIR)$(BINDIR)/log-login-utmp" .PHONY: install-lastlog install-lastlog: bin/log-login-lastlog - install -dm755 -- "$(DESTDIR)$(BINDIR)" - install $< -- "$(DESTDIR)$(BINDIR)/log-login-lastlog" + mkdir -p -- "$(DESTDIR)$(BINDIR)" + cp -- bin/log-login-lastlog "$(DESTDIR)$(BINDIR)/log-login-lastlog" .PHONY: install-syslog install-syslog: bin/log-login-syslog - install -dm755 -- "$(DESTDIR)$(BINDIR)" - install $< -- "$(DESTDIR)$(BINDIR)/log-login-syslog" + mkdir -p -- "$(DESTDIR)$(BINDIR)" + cp -- bin/log-login-syslog "$(DESTDIR)$(BINDIR)/log-login-syslog" .PHONY: install-audit install-audit: bin/log-login-audit - install -dm755 -- "$(DESTDIR)$(BINDIR)" - install $< -- "$(DESTDIR)$(BINDIR)/log-login-audit" + mkdir -p -- "$(DESTDIR)$(BINDIR)" + cp -- bin/log-login-audit "$(DESTDIR)$(BINDIR)/log-login-audit" .PHONY: install-doc install-doc: install-info install-pdf install-ps install-dvi .PHONY: install-info install-info: cerberus-logging.info - install -dm755 -- "$(DESTDIR)$(INFODIR)" - install -m644 -- "$<" "$(DESTDIR)$(INFODIR)/$(PKGNAME).info" + mkdir -p -- "$(DESTDIR)$(INFODIR)" + cp -- cerberus-logging.info "$(DESTDIR)$(INFODIR)/$(PKGNAME).info" .PHONY: install-pdf install-pdf: cerberus-logging.pdf - install -dm755 -- "$(DESTDIR)$(DOCDIR)" - install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf" + mkdir -p -- "$(DESTDIR)$(DOCDIR)" + cp -- cerberus-logging.pdf "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf" .PHONY: install-ps install-ps: cerberus-logging.ps - install -dm755 -- "$(DESTDIR)$(DOCDIR)" - install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps" + mkdir -p -- "$(DESTDIR)$(DOCDIR)" + cp -- cerberus-logging.ps "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps" .PHONY: install-dvi install-dvi: cerberus-logging.dvi - install -dm755 -- "$(DESTDIR)$(DOCDIR)" - install -m644 -- "$<" "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi" + mkdir -p -- "$(DESTDIR)$(DOCDIR)" + cp -- cerberus-logging.dvi "$(DESTDIR)$(DOCDIR)/$(PKGNAME).dvi" .PHONY: uninstall @@ -174,7 +166,6 @@ uninstall: -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING" -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE" -rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" - -rmdir -- "$(DESTDIR)$(PREFIX)$(LICENSES)/$(PKGNAME)" -rm -- "$(DESTDIR)$(INFODIR)/$(PKGNAME).info" -rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).pdf" -rm -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME).ps" @@ -183,5 +174,4 @@ uninstall: .PHONY: clean clean: - -rm -r bin obj *.su src/*.su - + -rm -fr -- bin obj *.su src/*.su -- cgit v1.2.3-70-g09d2