Makefile: directory specification changes

Revert "Merge branch 'main' into strerror (not PGP signed)"
This reverts commit 7e45af1bcaadf15bc9d7d2d6e6fd68542f2f6ea1, reversing changes made to d87b5d095870cb0874629ebcda13f069e1c4014f.
2024-03-24 13:28:42 -06:00 · 2024-03-24 13:15:55 -06:00 · 2024-03-24 00:18:15 +00:00 · 2024-03-18 21:01:48 -06:00 · 2024-03-18 20:56:06 -06:00 · 2024-03-18 20:53:08 -06:00
1 changed files with 12 additions and 12 deletions
--- a/24
+++ b/24
@ -13,18 +13,18 @@
 .PRAGMA: posix_202x # future POSIX standard support à la pdpmake(1)
 .PRAGMA: command_comment # breaks without this?

-DESTDIR=./dist
-PREFIX=/usr/local
+DESTDIR ?= dist
+PREFIX ?= /usr/local

-SYSEXITS!=printf '\043include <sysexits.h>\n' | cpp -M - | sed 's/ /\n/g' \
-	| sed -n 's/sysexits\.h//p' || printf 'include/\n'
+SYSEXITS != printf '\043include <sysexits.h>\n' | cpp -M - | sed 's/ /\n/g' \
+	| sed -n 's/sysexits\.h//p' || printf 'include\n'

-CC?=cc
-RUSTC?=rustc
-RUSTLIBS=--extern getopt=build/o/libgetopt.rlib \
+CC ?= cc
+RUSTC ?= rustc
+RUSTLIBS = --extern getopt=build/o/libgetopt.rlib \
 	--extern sysexits=build/o/libsysexits.rlib \
 	--extern strerror=build/o/libstrerror.rlib
-CFLAGS+=-I$(SYSEXITS)
+CFLAGS += -I$(SYSEXITS)

 .PHONY: all
 all: dj false fop hru intcmp rpn scrut str strcmp true
@ -36,12 +36,12 @@ build:

 .PHONY: clean
 clean:
-	rm -rf build/ dist/
+	rm -rf build dist

 dist: all
-	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
-	cp build/bin/* $(DESTDIR)$(PREFIX)/bin/
-	cp docs/*.1 $(DESTDIR)$(PREFIX)/share/man/man1/
+	mkdir -p $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/share/man/man1
+	cp build/bin/* $(DESTDIR)/$(PREFIX)/bin
+	cp docs/*.1 $(DESTDIR)/$(PREFIX)/share/man/man1

 .PHONY: install
 install: dist
Author	SHA1	Message	Date
emma	c75bb93001	Makefile: directory specification changes	2024-03-24 13:28:42 -06:00
emma	31ae3d1997	Revert "Merge branch 'main' into strerror (not PGP signed)" This reverts commit 7e45af1bcaadf15bc9d7d2d6e6fd68542f2f6ea1, reversing changes made to d87b5d095870cb0874629ebcda13f069e1c4014f.	2024-03-24 13:15:55 -06:00
dtb	7e45af1bca	Merge branch 'main' into strerror	2024-03-24 00:18:15 +00:00
emma	127192185f	Merge branch 'dj-fix' (closes #66 )	2024-03-18 21:01:48 -06:00
emma	f81232685a	Merge branch 'mm'	2024-03-18 20:56:06 -06:00
emma	05b5a4480c	Merge branch 'swab' (closes #22 )	2024-03-18 20:53:08 -06:00
DTB	135bf2a8eb	mm(1), mm.1: bring source in line with documentation	2024-02-26 09:11:47 -07:00
DTB	d74bc715cf	mm(1): fix full file handling	2024-02-26 09:02:58 -07:00
DTB	f14877118d	Makefile: add swab(1)	2024-02-26 08:43:03 -07:00
DTB	bbac85daf8	swab(1): add copyright notice	2024-02-26 08:42:06 -07:00
DTB	1e041a52a2	swab.1: add swab(1) man page	2024-02-24 03:21:20 -07:00
DTB	e788947fc4	swab(1): add argument parsing	2024-02-24 03:04:05 -07:00
DTB	3f0d95fe8f	swab(1): minimum viable program	2024-02-23 20:49:24 -07:00
DTB	58245c9484	dj(1): remove function pointer hijinks (fixes #66 )	2024-02-22 19:27:14 -07:00
DTB	395205d4c6	mm.1: fix case in copyright thingy	2024-02-22 19:14:38 -07:00
DTB	194b19f94b	mm(1): add	2024-02-17 23:43:22 -07:00