[Pkg-electronics-commits] [gnucap] 07/11: move gnucap-conf to "main"

[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 41aece17e47db04135dadc1520e8927371f9952f
Author: al davis <ad211 at freeelectron.net>
Date:   Tue Jan 26 00:55:10 2016 -0500

    move gnucap-conf to "main"
---
 configure                             | 13 -------------
 main/Make1                            |  2 +-
 main/configure                        | 12 ++++++++++++
 gnucap-conf.in => main/gnucap-conf.in |  0
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index bc38708..062ae38 100755
--- a/configure
+++ b/configure
@@ -25,19 +25,6 @@ fi
 
 args="--prefix=$prefix"
 
-# BUG: install plugins to libdir.
-pkglibdir=$prefix/lib
-
-# bug. this is not implemented consistently.
-CXX=${CXX-g++}
-
-sed -e "s#@prefix@#$prefix#" \
-    -e "s#@libdir@#$prefix/lib#" \
-    -e "s#@pkglibdir@#$pkglibdir#" \
-    -e "s#@CXXFLAGS@#$CCFLAGS#" \
-    -e "s#@LIBS@#-lgnucap#" \
-    -e "s#@CXX@#$CXX#" < gnucap-conf.in > gnucap-conf
-
 echo "Configuring gnucap using $args"
 #---------------------------------------------------
 echo include
diff --git a/main/Make1 b/main/Make1
index 00a9f5a..994462b 100644
--- a/main/Make1
+++ b/main/Make1
@@ -21,7 +21,7 @@
 #------------------------------------------------------------------------
 TARGET = gnucap
 #------------------------------------------------------------------------
-INSTALL_FILES = $(TARGET)$(TARGET_EXT) ../../gnucap-conf
+INSTALL_FILES = $(TARGET)$(TARGET_EXT) ../gnucap-conf
 #------------------------------------------------------------------------
 INSTALL_DIR = $(PREFIX)/bin
 #------------------------------------------------------------------------
diff --git a/main/configure b/main/configure
index b56e2cc..d51cc61 100755
--- a/main/configure
+++ b/main/configure
@@ -22,7 +22,19 @@ else
 fi
 
 sed -e "s#/usr/local#$prefix#" ../Makefile.template > Makefile
+#----------------------------------------------------------------
+# BUG: install plugins to libdir.
+pkglibdir=$prefix/lib
+
+# bug. this is not implemented consistently.
+CXX=${CXX-g++}
 
+sed -e "s#@prefix@#$prefix#" \
+    -e "s#@libdir@#$prefix/lib#" \
+    -e "s#@pkglibdir@#$pkglibdir#" \
+    -e "s#@CXXFLAGS@#$CCFLAGS#" \
+    -e "s#@LIBS@#-lgnucap#" \
+    -e "s#@CXX@#$CXX#" < gnucap-conf.in > gnucap-conf
 #----------------------------------------------------------------
 echo "CCFLAGS = \\" >Make.ccflags
 echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
diff --git a/gnucap-conf.in b/main/gnucap-conf.in
similarity index 100%
rename from gnucap-conf.in
rename to main/gnucap-conf.in

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