From 1d6aeecfc752a0f86a3bdbcfebb5b2db4334a3d7 Mon Sep 17 00:00:00 2001 From: Mustached Squid Date: Fri, 17 Jun 2022 15:09:47 +0100 Subject: [PATCH 1/2] fix 'make install-root' clobbering existing gophermaps --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 467170e..da88568 100644 --- a/Makefile.in +++ b/Makefile.in @@ -142,7 +142,7 @@ install-man: install-root: $(INSTALL) -d -m 755 $(DESTDIR)$(ROOT) - $(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap + [ ! -f $(DESTDIR)$(ROOT)/gophermap ]$(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap install-inetd-update: install-root update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" From 1d79de712d1b5759a777cc6299ea1f39d715c8b8 Mon Sep 17 00:00:00 2001 From: Mustached Squid Date: Fri, 17 Jun 2022 15:26:52 +0100 Subject: [PATCH 2/2] Previous attempt at fixing 'make install-root' had a tiny bug, which is now solved --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index da88568..2942e2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -142,7 +142,7 @@ install-man: install-root: $(INSTALL) -d -m 755 $(DESTDIR)$(ROOT) - [ ! -f $(DESTDIR)$(ROOT)/gophermap ]$(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap + [ ! -f $(DESTDIR)$(ROOT)/gophermap ] && $(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap install-inetd-update: install-root update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)"