[Pkg-electronics-commits] [gnucap] 24/43: move gnucap.conf into @sysconfdir@

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit 7814b2eb6e1a8f74f3b4a5640d7e82d74af1631e
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sun Apr 23 23:28:01 2017 +0100

    move gnucap.conf into @sysconfdir@
    
    ... meeting gnu standard.
    https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
---
 Make3               | 8 +++++++-
 main/Make1          | 4 ++--
 main/configure      | 1 +
 main/gnucap-conf.in | 8 ++++++--
 main/gnucap.conf.in | 1 +
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Make3 b/Make3
index fe7d128..3cff268 100644
--- a/Make3
+++ b/Make3
@@ -31,10 +31,16 @@ install : $(INSTALL_FILES) $(DATA_FILES)
 	echo ==================
 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
 	cp $(INSTALL_FILES) $(DESTDIR)$(INSTALL_DIR)
+
 	[ -z "$(INSTALL_DATA_DIR)" ] || \
 	mkdir -p $(DESTDIR)$(INSTALL_DATA_DIR)
 	[ -z "$(INSTALL_DATA_FILES)" ] || \
-        cp $(INSTALL_DATA_FILES) $(DESTDIR)$(INSTALL_DATA_DIR)
+	cp $(INSTALL_DATA_FILES) $(DESTDIR)$(INSTALL_DATA_DIR)
+
+	[ -z "$(INSTALL_SYSCONF_DIR)" ] || \
+	mkdir -p $(DESTDIR)$(INSTALL_SYSCONF_DIR)
+	[ -z "$(INSTALL_SYSCONF_FILES)" ] || \
+	cp $(INSTALL_SYSCONF_FILES) $(DESTDIR)$(INSTALL_SYSCONF_DIR)
 #------------------------------------------------------------------------
 uninstall :
 	(cd $(DESTDIR)$(INSTALL_DIR) ; rm $(INSTALL_FILES))
diff --git a/main/Make1 b/main/Make1
index e95763b..890d6d6 100644
--- a/main/Make1
+++ b/main/Make1
@@ -24,8 +24,8 @@ TARGET = gnucap
 INSTALL_DIR = $(PREFIX)/bin
 INSTALL_FILES = $(TARGET)$(TARGET_EXT) ../gnucap-conf
 #------------------------------------------------------------------------
-INSTALL_DATA_DIR = $(PREFIX)/share/gnucap
-INSTALL_DATA_FILES = ../gnucap.conf
+INSTALL_SYSCONF_DIR = $(PREFIX)/etc
+INSTALL_SYSCONF_FILES = ../gnucap.conf
 #------------------------------------------------------------------------
 DELETED =
 #------------------------------------------------------------------------
diff --git a/main/configure b/main/configure
index 7910025..a1359a5 100755
--- a/main/configure
+++ b/main/configure
@@ -34,6 +34,7 @@ sed -e "s#@prefix@#$prefix#" \
     -e "s#@libdir@#$prefix/lib#" \
     -e "s#@includedir@#$\{prefix\}/include#" \
     -e "s#@datarootdir@#$\{prefix\}/share/gnucap#" \
+    -e "s#@sysconfdir@#$\{prefix\}/etc#" \
     -e "s#@pkglibdir@#$pkglibdir#" \
     -e "s#@CXXFLAGS@#$CCFLAGS#" \
     -e "s#@LIBS@#-lgnucap#" \
diff --git a/main/gnucap-conf.in b/main/gnucap-conf.in
index 2eac87c..c2f47f6 100644
--- a/main/gnucap-conf.in
+++ b/main/gnucap-conf.in
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 prefix="@prefix@"
-datarootdir="@datarootdir@"
+sysconfdir="@sysconfdir@"
 
-source $datarootdir/gnucap.conf
+source $sysconfdir/gnucap.conf
 
 case $1 in
 	--cppflags)
@@ -36,6 +36,9 @@ case $1 in
 	--data)
 		echo "$datarootdir"
 	;;
+	--sysconfdir)
+		echo "$sysconfdir"
+	;;
 	*)
 	echo $0 --cppflags
 	echo $0 --cxxflags
@@ -46,4 +49,5 @@ case $1 in
 	echo $0 --libs
 	echo $0 --exec-prefix
 	echo $0 --data
+	echo $0 --sysconfdir
 esac
diff --git a/main/gnucap.conf.in b/main/gnucap.conf.in
index b33119d..96fad6d 100644
--- a/main/gnucap.conf.in
+++ b/main/gnucap.conf.in
@@ -9,3 +9,4 @@ LIBS="@LIBS@"
 CXX="@CXX@"
 CXXFLAGS="@CXXFLAGS@"
 datarootdir="@datarootdir@"
+sysconfdir="@sysconfdir@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git