firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 04:03:04 +01:00
Code Issues

Do not hard-code the value of ISC_PREFIX, but set it to installation

Browse Source 
prefix (--prefix option).
This commit is contained in:
eku 2002-09-20 08:28:51 +00:00
parent a0b5fffdde
commit e65fb873c4
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.46 2002-09-19 10:51:29 eku Exp $ dnl $Id: configure.in,v 1.47 2002-09-20 08:28:48 eku Exp $
dnl ############################# INITIALISATION ############################### dnl ############################# INITIALISATION ###############################
@ -265,6 +265,7 @@ NEW_FIREBIRD_DIR=$GEN_ROOT/firebird
AC_SUBST(BUILD_ROOT_DIR) AC_SUBST(BUILD_ROOT_DIR)
AC_SUBST(NEW_FIREBIRD_DIR) AC_SUBST(NEW_FIREBIRD_DIR)
AC_DEFINE_UNQUOTED(ISC_PREFIX,"$prefix")
dnl AC_DEFINE_UNQUOTED(FB_BUILD_TYPE, "$BuildType") dnl AC_DEFINE_UNQUOTED(FB_BUILD_TYPE, "$BuildType")
dnl AC_DEFINE_UNQUOTED(FB_MAJOR_VER, "$MajorVer") dnl AC_DEFINE_UNQUOTED(FB_MAJOR_VER, "$MajorVer")
dnl AC_DEFINE_UNQUOTED(FB_MINOR_VER, "$MinorVer") dnl AC_DEFINE_UNQUOTED(FB_MINOR_VER, "$MinorVer")

10
src/jrd/file_params.h
View File

@ -121,19 +121,11 @@
#ifdef UNIX #ifdef UNIX
#define WORKFILE "/tmp/" #define WORKFILE "/tmp/"
#ifdef LINUX
#define ISC_PREFIX "/usr/local/firebird/"
#elif defined(SINIXZ)
#define ISC_PREFIX "/usr/apc/firebird/"
#else
#ifdef DARWIN #ifdef DARWIN
#undef ISC_PREFIX
#define ISC_PREFIX "/all/files/are/in/framework/resources" #define ISC_PREFIX "/all/files/are/in/framework/resources"
/* #define ISC_PREFIX "/tmp" */
#define DARWIN_GEN_DIR "var" #define DARWIN_GEN_DIR "var"
#define DARWIN_FRAMEWORK_ID "com.firebirdsql.Firebird" #define DARWIN_FRAMEWORK_ID "com.firebirdsql.Firebird"
#else
#define ISC_PREFIX "/usr/local/firebird/"
#endif
#endif #endif
#endif #endif

4
src/make.new/config/config.h.in
View File

@ -1,4 +1,4 @@
#ident "$Id: config.h.in,v 1.35 2002-09-19 10:51:31 eku Exp $" #ident "$Id: config.h.in,v 1.36 2002-09-20 08:28:51 eku Exp $"
/* /*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports: * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports:
@ -126,4 +126,6 @@
#undef UNIXWARE #undef UNIXWARE
#undef SINIXZ #undef SINIXZ
#define ISC_PREFIX /usr/local/firebird
#endif #endif