From e82f76b87ff9779532908a02315b6425fb8a53f4 Mon Sep 17 00:00:00 2001
From: Einhard Leichtfuß <alguien@respiranto.de>
Date: Mon, 24 Dec 2018 21:56:30 +0100
Subject: Rename conf file and bash completion script

Also,
- Add the new manpage to the Makefile.
- Add additional dependencies in README.
- Fix some small formatting mistakes in ctct(1).
---
 Makefile.in | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 656c116..ed1cdeb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
 SRCS = @PACKAGE_NAME@.c
 DOCS = COPYING README CHANGELOG
-CONFIGS = config.sh
+
+# If there were more than one, a separate confdir should be created.
+CONFIG = ctct_config
 
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -m 755
@@ -39,44 +41,47 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 datarootdir = @datarootdir@
 sysconfdir = @sysconfdir@
-confdir = @confdir@
 docdir = @docdir@
 bash_completion_dir = @bash_completion_dir@
 mandir = @mandir@
-man1dir = ${mandir}/man1
+man1dir = $(mandir)/man1
+man5dir = $(mandir)/man5
 man1ext = .1
+man5ext = .5
 
 all: $(TARGET)
 
 install: installdirs
 	$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/
-	$(INSTALL_DATA) $(CONFIGS) $(DESTDIR)$(confdir)/
+	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(sysconfdir)/
 	$(INSTALL_DATA) $(DOCS) $(DESTDIR)$(docdir)/
-	$(INSTALL_DATA) $(TARGET).bash_completion \
+	$(INSTALL_DATA) bash_completion \
 		$(DESTDIR)$(bash_completion_dir)/$(TARGET)
 	$(INSTALL_DATA) $(TARGET)$(man1ext) $(DESTDIR)$(man1dir)/
+	$(INSTALL_DATA) $(CONFIG)$(man5ext) $(DESTDIR)$(man5dir)/
 
 installdirs:
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(INSTALL_DIR) $(DESTDIR)$(confdir)
+	$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
 	$(INSTALL_DIR) $(DESTDIR)$(docdir)
 	$(INSTALL_DIR) $(DESTDIR)$(bash_completion_dir)
 	$(INSTALL_DIR) $(DESTDIR)$(man1dir)
+	$(INSTALL_DIR) $(DESTDIR)$(man5dir)
 
 uninstall:
 	$(RM) $(DESTDIR)$(bindir)/$(TARGET)
-	# only remove configuration file if unchanged
-	for file in $(CONFIGS); do \
-		if cmp $$file $(DESTDIR)$(confdir)/$$file; then \
-			$(RM) $(DESTDIR)$(confdir)/$$file; \
-		fi \
-	done
-	-$(RM) -d $(DESTDIR)$(confdir)
-	for file in $(DOCS); do \
+	# Only remove configuration file if unchanged.
+	if cmp $(CONFIG) $(DESTDIR)$(sysconfdir)/$(CONFIG); \
+	then \
+		$(RM) $(DESTDIR)$(sysconfdir)/$(CONFIG); \
+	fi
+	for file in $(DOCS); \
+	do \
 		$(RM) $(DESTDIR)$(docdir)/$$file; \
 	done
 	-$(RM) -d $(DESTDIR)$(docdir)
 	$(RM) $(DESTDIR)$(bash_completion_dir)/$(TARGET)
 	$(RM) $(DESTDIR)$(man1dir)/$(TARGET)$(man1ext)
+	$(RM) $(DESTDIR)$(man5dir)/$(CONFIG)$(man5ext)
 
 .PHONY: install installdirs uninstall
-- 
cgit v1.2.3