From b9391f0b8c7b946ad6ecaf0ffe8cc156a5757918 Mon Sep 17 00:00:00 2001
From: Manuel Argüelles <manuel.arguelles@gmail.com>
Date: Sun, 31 Jan 2021 00:53:13 -0500
Subject: [PATCH] Clean up the installation process

This commit fixes the use of DESTDIR and places pc files in
/usr/share/pkgconfig, as there aren't any libraries shipped in the
resulting package, so no need for an arch-specific pc file. Also allows
to set CFLAGS without disabling the warnings.

---
 Makefile | 22 +++++++++++-----------

diff --git a/Makefile b/Makefile
index 66d1a241eb4fc9d83899b3a31a0515e4e0b7849a..fb200086d94ac4b4fc898d0f454b5ae0f760707c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 VERSION=1.11.1
-CFLAGS+=-g -DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
+CFLAGS?=-g
+MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
 LDFLAGS+=-static
 INCLUDE+=-Iinclude
 PREFIX?=/usr/local
-_INSTDIR=$(DESTDIR)$(PREFIX)
-BINDIR?=$(_INSTDIR)/bin
-MANDIR?=$(_INSTDIR)/share/man
-PCDIR?=$(_INSTDIR)/lib/pkgconfig
+BINDIR?=$(PREFIX)/bin
+MANDIR?=$(PREFIX)/share/man
+PCDIR?=$(PREFIX)/share/pkgconfig
 OUTDIR=.build
 HOST_SCDOC=./scdoc
 .DEFAULT_GOAL=all
@@ -24,7 +24,7 @@ 	$(OUTDIR)/util.o
 
 $(OUTDIR)/%.o: src/%.c
 	@mkdir -p $(OUTDIR)
-	$(CC) -std=c99 -pedantic -c -o $@ $(CFLAGS) $(INCLUDE) $<
+	$(CC) -std=c99 -pedantic -c -o $@ $(CFLAGS) $(MAINFLAGS) $(INCLUDE) $<
 
 scdoc: $(OBJECTS)
 	$(CC) $(LDFLAGS) -o $@ $^
@@ -44,11 +44,11 @@ clean:
 	rm -rf $(OUTDIR) scdoc scdoc.1 scdoc.5 scdoc.pc
 
 install: all
-	mkdir -p $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man5 $(PCDIR)
-	install -m755 scdoc $(BINDIR)/scdoc
-	install -m644 scdoc.1 $(MANDIR)/man1/scdoc.1
-	install -m644 scdoc.5 $(MANDIR)/man5/scdoc.5
-	install -m644 scdoc.pc $(PCDIR)/scdoc.pc
+	mkdir -p $(DESTDIR)/$(BINDIR) $(DESTDIR)/$(MANDIR)/man1 $(DESTDIR)/$(MANDIR)/man5 $(DESTDIR)/$(PCDIR)
+	install -m755 scdoc $(DESTDIR)/$(BINDIR)/scdoc
+	install -m644 scdoc.1 $(DESTDIR)/$(MANDIR)/man1/scdoc.1
+	install -m644 scdoc.5 $(DESTDIR)/$(MANDIR)/man5/scdoc.5
+	install -m644 scdoc.pc $(DESTDIR)/$(PCDIR)/scdoc.pc
 
 check: scdoc scdoc.1 scdoc.5
 	@find test -perm -111 -exec '{}' \;

-- 
2.48.1