From 589794e75ab2551e9c670211c7375221caffad69 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Thu, 5 Feb 2015 20:41:17 +0000
Subject: [PATCH] added --prefix to install callbacks
---
Makefile.in | 5 +++++
configure | 7 +++++++
configure.in | 2 ++
configure_for_cgc | 2 +-
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 14ff981..d9e9e01 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,7 @@
+prefix=@prefix@
+
CC=@CC@
CFLAGS=@CFLAGS@
@@ -11,3 +13,6 @@ all:
clean:
for i in ${dirs}; do cd $$i; make clean; cd ..; done
+install:
+ cp lib/callbacks.exe $(prefix)/bin/callbacks.exe
+
diff --git a/configure b/configure
index 56decfd..8de6c41 100755
--- a/configure
+++ b/configure
@@ -581,6 +581,7 @@ PACKAGE_STRING='myconfig version-0.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
+ac_default_prefix=$ZIPR_CALLBACKS
ac_subst_vars='LIB
OS
AR
@@ -1744,6 +1745,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6077,6 +6079,8 @@ enable_dir watchsyscall
enable_dir p1
enable_dir inferfn
+prefix=$prefix
+
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@@ -7249,6 +7253,9 @@ fi
+echo prefix=$prefix
+prefix=$prefix
+
echo "------------------------------------------------"
echo "Ignore configure warnings about unknown --enable options for these items: $bad_warnings"
diff --git a/configure.in b/configure.in
index b510346..e47d58d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
AC_INIT(myconfig, version-0.1)
+AC_PREFIX_DEFAULT($ZIPR_CALLBACKS)
AC_PROG_CC
AC_ARG_ENABLE([debugging], [ --enable-debugging enable -g when compiling])
@@ -75,6 +76,7 @@ AC_SUBST(ARCH)
AC_SUBST(AR)
AC_SUBST(OS)
AC_SUBST(LIB)
+AC_SUBST(prefix, $prefix)
echo "------------------------------------------------"
echo "Ignore configure warnings about unknown --enable options for these items: $bad_warnings"
diff --git a/configure_for_cgc b/configure_for_cgc
index 9720089..e5c24dc 100755
--- a/configure_for_cgc
+++ b/configure_for_cgc
@@ -1,7 +1,7 @@
#!/bin/bash
-./configure --enable-watchsyscall --enable-cgc $*
+./configure --enable-watchsyscall --enable-cgc --prefix=$ZIPR_INSTALL $*
# enable p1 only if it's needed.
--
GitLab