From 85abcf955d3a60e23e68aeebef8a52e56884f3d0 Mon Sep 17 00:00:00 2001
From: merakor <cem@ckyln.com>
Date: Wed, 11 Aug 2021 14:25:16 +0000
Subject: Makefile: don't run Makefile if config.mk doesn't exist

FossilOrigin-Name: b5faffbadc715e31283c04c543a0df3ff9aa32552f212ff9872b6bb45570cfdc
---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b2c7a5f..c424031 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Carbs Packaging Tools
--include config.mk
+include config.mk
 
 INSTALL_SH = ./tools/install.sh
 CONTRIB = `find contrib -name 'cpt*' ! -name '*.*'`
@@ -7,7 +7,6 @@ SRC     = `find src -name 'cpt*' ! -name '*.*'`
 BIN     = ${SRC} ${CONTRIB}
 
 all: src/cpt-lib
-	@if ! [ -e config.mk ]; then echo "Please run './configure'"; exit 1; fi
 	@test "${DOCS}" != yes || ${MAKE} -C docs all
 
 src/cpt-lib: src/cpt-lib.in
@@ -30,7 +29,6 @@ tests/etc/cpt-hook:
 	ln -s ../hook-file $@
 
 dist: docs/cpt.info
-	@if ! [ -e config.mk ]; then echo "Please run './configure'"; exit 1; fi
 	./tools/mkdist.sh "${VERSION}"
 
 install: all
-- 
cgit v1.2.3


From f8c1e8df47571ca94005f13cdcb2f12ffe3fcb8a Mon Sep 17 00:00:00 2001
From: merakor <cem@ckyln.com>
Date: Fri, 13 Aug 2021 08:04:46 +0000
Subject: Makefile: fix install target

FossilOrigin-Name: 09ac753ee6dbfdb7a461cfeb28ba7dfd64e6ec77fb1f7e8dc8af8d5f9215124f
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c424031..691caf6 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,9 @@ dist: docs/cpt.info
 install: all
 	test "${DOCS}" != yes || ${MAKE} -C docs install
 	[ -f docs/cpt.info ] && \
-		${INSTALL_SH} -Dm644 docs/cpt.info ${DESTDIR}${INFODIR}/cpt.info
+		${INSTALL_SH} -Dm644 docs/cpt.info ${DESTDIR}${INFODIR}/cpt.info ||:
 	[ -f docs/cpt.txt ] && \
-		${INSTALL_SH} -Dm644 docs/cpt.txt  ${DESTDIR}${DOCDIR}/cpt.txt
+		${INSTALL_SH} -Dm644 docs/cpt.txt  ${DESTDIR}${DOCDIR}/cpt.txt ||:
 	${INSTALL_SH} -Dm644 CHANGELOG.md  ${DESTDIR}${DOCDIR}/CHANGELOG
 	${INSTALL_SH} -Dm755 -t ${DESTDIR}${BINDIR} ${BIN}
 	${INSTALL_SH} -Dm644 -t ${DESTDIR}${MAN1} man/*.1
-- 
cgit v1.2.3