[qflow] 11/13: Fix install differently

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository qflow.

commit ed3d26f729b0cf2ef4135c08ef473bb05164d7d6
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Apr 16 19:26:36 2015 +0200

    Fix install differently
---
 debian/patches/01_fix_install_dir.patch | 99 +++++++--------------------------
 debian/patches/series                   |  2 +-
 2 files changed, 21 insertions(+), 80 deletions(-)

diff --git a/debian/patches/01_fix_install_dir.patch b/debian/patches/01_fix_install_dir.patch
index 5950aa7..547fddd 100644
--- a/debian/patches/01_fix_install_dir.patch
+++ b/debian/patches/01_fix_install_dir.patch
@@ -1,80 +1,21 @@
-Index: qflow/scripts/Makefile.in
+Index: qflow/configure.in
 ===================================================================
---- qflow.orig/scripts/Makefile.in	2014-10-16 22:33:12.551197757 +0200
-+++ qflow/scripts/Makefile.in	2014-10-16 22:38:00.375195915 +0200
-@@ -9,8 +9,8 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
- 
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
--QFLOW_BIN_DIR = @QFLOW_BIN_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/lib/qflow
-+QFLOW_BIN_DIR = ${DESTDIR}/usr/bin
- 
- DEFAULTPARSER = @QFLOW_DEFAULT_PARSER@
- 
-@@ -37,9 +37,9 @@
- 		$(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
- 
- checkdirs.sh:  checkdirs.sh.in
--		sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
--		-e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
--		-e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
-+		sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#/usr/share/qflow/tech#' \
-+		-e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#/usr/lib/qflow/scripts#' \
-+		-e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#/usr/lib/qflow/bin#' \
- 		checkdirs.sh.in > checkdirs.sh
- 
- qflow.sh:  qflow.sh.in
-Index: qflow/src/Makefile.in
-===================================================================
---- qflow.orig/src/Makefile.in	2014-10-16 22:33:12.551197757 +0200
-+++ qflow/src/Makefile.in	2014-10-16 22:39:08.299195480 +0200
-@@ -9,7 +9,7 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
- 
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/lib/qflow
- QFLOW_GRAYWOLF_PATH = @QFLOW_GRAYWOLF_PATH@
- QFLOW_QROUTER_PATH = @QFLOW_QROUTER_PATH@
- QFLOW_ABC_PATH = @QFLOW_ABC_PATH@
-Index: qflow/tech/Makefile.in
-===================================================================
---- qflow.orig/tech/Makefile.in	2014-10-16 22:33:12.555197757 +0200
-+++ qflow/tech/Makefile.in	2014-10-16 22:39:49.027195220 +0200
-@@ -9,7 +9,7 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
- 
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
- 
- TECH_DIRS = osu035 osu050
- 
-Index: qflow/tech/osu035/Makefile.in
-===================================================================
---- qflow.orig/tech/osu035/Makefile.in	2014-10-16 22:33:12.555197757 +0200
-+++ qflow/tech/osu035/Makefile.in	2014-10-16 22:40:08.771195093 +0200
-@@ -9,7 +9,7 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
- 
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
- 
- TECH_FILES = osu035.genlib osu035.super osu035.par osu035_stdcells.lef
- TECH_FILES += osu035.sh osu035_stdcells.sp osu035.magicrc osu035.prm
-Index: qflow/tech/osu050/Makefile.in
-===================================================================
---- qflow.orig/tech/osu050/Makefile.in	2014-10-16 22:33:12.555197757 +0200
-+++ qflow/tech/osu050/Makefile.in	2014-10-16 22:40:31.907194945 +0200
-@@ -9,7 +9,7 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
- 
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
- 
- TECH_FILES = osu050.genlib osu050.super osu050.par osu050_stdcells.lef
- TECH_FILES += osu050.sh osu050_stdcells.sp osu050.magicrc osu050.prm
+--- qflow.orig/configure.in	2015-04-16 19:26:09.744184566 +0200
++++ qflow/configure.in	2015-04-16 19:25:33.432184257 +0200
+@@ -178,14 +178,14 @@
+ [  --with-libdir=DIR			path to qflow runtime files], [
+    QFLOW_LIB_DIR=$withval
+ ], [
+-   QFLOW_LIB_DIR=${ac_default_prefix}/share/qflow
++   QFLOW_LIB_DIR=${prefix}/share/qflow
+ ])
+ 
+ AC_ARG_WITH(bindir,
+ [  --with-bindir=DIR			path to qflow launch script], [
+    QFLOW_BIN_DIR=$withval
+ ], [
+-   QFLOW_BIN_DIR=${ac_default_prefix}/bin
++   QFLOW_BIN_DIR=${prefix}/bin
+ ])
+ 
+ dnl AC_SUBST(QFLOW_QROUTER_PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 32f7c4a..fa0c4f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-02_fix_compile_error.patch
 01_fix_install_dir.patch
+02_fix_compile_error.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qflow.git