[Pkg-electronics-commits] [gnucap] 23/43: gnucap.conf: move configuration to gnucap.conf

[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 d4da2145ad7ac067a0c80b4cb82a1b5ec469153b
Author: Felix Salfelder <felix at salfelder.org>
Date:   Thu Sep 29 20:31:16 2016 +0100

    gnucap.conf: move configuration to gnucap.conf
---
 Make3               |  6 +++++-
 include/patchlev.h  |  2 +-
 main/Make1          |  4 +++-
 main/configure      |  1 +
 main/gnucap-conf.in |  9 ++-------
 main/gnucap.conf.in | 11 +++++++++++
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Make3 b/Make3
index eee94b2..fe7d128 100644
--- a/Make3
+++ b/Make3
@@ -27,10 +27,14 @@ tags: $(HDRS) $(SRCS)
 checkout:
 	co $(RAW)
 #------------------------------------------------------------------------
-install : $(INSTALL_FILES)
+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)
 #------------------------------------------------------------------------
 uninstall :
 	(cd $(DESTDIR)$(INSTALL_DIR) ; rm $(INSTALL_FILES))
diff --git a/include/patchlev.h b/include/patchlev.h
index 1de38e1..dbd4731 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "unstable 2017.04.18"
+#define PATCHLEVEL "gnucap.conf-1 2017.04.23"
diff --git a/main/Make1 b/main/Make1
index 994462b..e95763b 100644
--- a/main/Make1
+++ b/main/Make1
@@ -21,9 +21,11 @@
 #------------------------------------------------------------------------
 TARGET = gnucap
 #------------------------------------------------------------------------
+INSTALL_DIR = $(PREFIX)/bin
 INSTALL_FILES = $(TARGET)$(TARGET_EXT) ../gnucap-conf
 #------------------------------------------------------------------------
-INSTALL_DIR = $(PREFIX)/bin
+INSTALL_DATA_DIR = $(PREFIX)/share/gnucap
+INSTALL_DATA_FILES = ../gnucap.conf
 #------------------------------------------------------------------------
 DELETED =
 #------------------------------------------------------------------------
diff --git a/main/configure b/main/configure
index fb3db61..7910025 100755
--- a/main/configure
+++ b/main/configure
@@ -42,6 +42,7 @@ sed -e "s#@prefix@#$prefix#" \
 
 fill_template config.h
 fill_template gnucap-conf
+fill_template gnucap.conf
 
 chmod +x gnucap-conf
 #----------------------------------------------------------------
diff --git a/main/gnucap-conf.in b/main/gnucap-conf.in
index 168b953..2eac87c 100644
--- a/main/gnucap-conf.in
+++ b/main/gnucap-conf.in
@@ -1,15 +1,10 @@
 #!/bin/bash
 
 prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-includedir="@includedir@"
-libdir="@libdir@"
-pkglibdir="@pkglibdir@"
-LIBS="@LIBS@"
-CXX="@CXX@"
-CXXFLAGS="@CXXFLAGS@"
 datarootdir="@datarootdir@"
 
+source $datarootdir/gnucap.conf
+
 case $1 in
 	--cppflags)
 		echo "-I$includedir/gnucap"
diff --git a/main/gnucap.conf.in b/main/gnucap.conf.in
new file mode 100644
index 0000000..b33119d
--- /dev/null
+++ b/main/gnucap.conf.in
@@ -0,0 +1,11 @@
+# a shell/make fragment
+
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+includedir="@includedir@"
+libdir="@libdir@"
+pkglibdir="@pkglibdir@"
+LIBS="@LIBS@"
+CXX="@CXX@"
+CXXFLAGS="@CXXFLAGS@"
+datarootdir="@datarootdir@"

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