Menu
▾
▴
[Firebird-checkins] CVS: firebird2 configure.in, 1.368.2.6, 1.368.2.7
|
From: Alexander P. <ale...@us...> - 2010-01-29 11:35:02
|
Build Version : T3.0.0.27497 Firebird 3.0 Unstable (writeBuildNum.sh,v 1.27669 2010/01/29 11:34:23 alexpeshkof ) Update of /cvsroot/firebird/firebird2 In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1553 Modified Files: Tag: B2_5_Release configure.in Log Message: Fixed regression when missing --prefix switch in configure. Fixed FreeBSD built, install on FreeBSD is in progress. Index: configure.in =================================================================== RCS file: /cvsroot/firebird/firebird2/configure.in,v retrieving revision 1.368.2.6 retrieving revision 1.368.2.7 diff -b -U3 -r1.368.2.6 -r1.368.2.7 --- configure.in 30 Nov 2009 14:07:18 -0000 1.368.2.6 +++ configure.in 29 Jan 2010 11:34:20 -0000 1.368.2.7 @@ -24,9 +24,9 @@ define([XE_CONF_DIR],[ AC_ARG_WITH([$1], [AC_HELP_STRING([--with-$1], [$2])], - [[$3]=$withval + [[$3]="$withval" AC_DEFINE_UNQUOTED([$3], "$[$3]", [$2])], - [[$3]=[$4] + [[$3]="[`if test ""x$prefix"" = ""xNONE"" ; then echo ""$ac_default_prefix""; else echo ""$prefix""; fi`][$4]" AC_DEFINE_UNQUOTED([$3], [""], [$2])] ) AC_SUBST([$3]) @@ -111,7 +111,8 @@ ;; amd64-*-freebsd*) - MAKEFILE_PREFIX=freebsd + MAKEFILE_PREFIX=freebsd_amd64 + INSTALL_PREFIX=freebsd PLATFORM=FREEBSD AC_DEFINE(FREEBSD, 1, [Define this if OS is FreeBSD]) AC_DEFINE(AMD64, 1, [Define this if CPU is amd64]) @@ -510,23 +511,23 @@ dnl Use non-standard directory placement control dnl Sorry - GNU standard is not Ok for us -XE_CONF_DIR(fbbin, [executables DIR (PREFIX/bin)], FB_BINDIR, $prefix/bin) -XE_CONF_DIR(fbsbin, [system admin executables DIR (PREFIX/bin)], FB_SBINDIR, $prefix/bin) -XE_CONF_DIR(fbconf, [config files DIR (PREFIX)], FB_CONFDIR, $prefix) -XE_CONF_DIR(fblib, [object code libraries DIR (PREFIX/lib)], FB_LIBDIR, $prefix/lib) -XE_CONF_DIR(fbinclude, [C/C++ header files DIR (PREFIX/include)], FB_INCDIR, $prefix/include) -XE_CONF_DIR(fbdoc, [documentation root DIR (PREFIX/doc)], FB_DOCDIR, $prefix/doc) -XE_CONF_DIR(fbudf, [UDF DIR (PREFIX/UDF)], FB_UDFDIR, $prefix/UDF) -XE_CONF_DIR(fbsample, [examples DIR (PREFIX/examples)], FB_SAMPLEDIR, $prefix/examples) -XE_CONF_DIR(fbsample-db, [examples database DIR (PREFIX/examples/empbuild)], FB_SAMPLEDBDIR, $prefix/examples/empbuild) -XE_CONF_DIR(fbhelp, [QLI help DIR (PREFIX/help)], FB_HELPDIR, $prefix/help) -XE_CONF_DIR(fbintl, [international DIR (PREFIX/intl)], FB_INTLDIR, $prefix/intl) -XE_CONF_DIR(fbmisc, [misc DIR (PREFIX/misc)], FB_MISCDIR, $prefix/misc) -XE_CONF_DIR(fbsecure-db, [security database DIR (PREFIX)], FB_SECDBDIR, $prefix) -XE_CONF_DIR(fbmsg, [message files DIR (PREFIX)], FB_MSGDIR, $prefix) -XE_CONF_DIR(fblog, [log files DIR (PREFIX)], FB_LOGDIR, $prefix) -XE_CONF_DIR(fbglock, [guardian lock DIR (PREFIX)], FB_GUARDDIR, $prefix) -XE_CONF_DIR(fbplugins, [plugins DIR (PREFIX)], FB_PLUGDIR, $prefix/plugins) +XE_CONF_DIR(fbbin, [executables DIR (PREFIX/bin)], FB_BINDIR, /bin) +XE_CONF_DIR(fbsbin, [system admin executables DIR (PREFIX/bin)], FB_SBINDIR, /bin) +XE_CONF_DIR(fbconf, [config files DIR (PREFIX)], FB_CONFDIR) +XE_CONF_DIR(fblib, [object code libraries DIR (PREFIX/lib)], FB_LIBDIR, /lib) +XE_CONF_DIR(fbinclude, [C/C++ header files DIR (PREFIX/include)], FB_INCDIR, /include) +XE_CONF_DIR(fbdoc, [documentation root DIR (PREFIX/doc)], FB_DOCDIR, /doc) +XE_CONF_DIR(fbudf, [UDF DIR (PREFIX/UDF)], FB_UDFDIR, /UDF) +XE_CONF_DIR(fbsample, [examples DIR (PREFIX/examples)], FB_SAMPLEDIR, /examples) +XE_CONF_DIR(fbsample-db, [examples database DIR (PREFIX/examples/empbuild)], FB_SAMPLEDBDIR, /examples/empbuild) +XE_CONF_DIR(fbhelp, [QLI help DIR (PREFIX/help)], FB_HELPDIR, /help) +XE_CONF_DIR(fbintl, [international DIR (PREFIX/intl)], FB_INTLDIR, /intl) +XE_CONF_DIR(fbmisc, [misc DIR (PREFIX/misc)], FB_MISCDIR, /misc) +XE_CONF_DIR(fbsecure-db, [security database DIR (PREFIX)], FB_SECDBDIR) +XE_CONF_DIR(fbmsg, [message files DIR (PREFIX)], FB_MSGDIR) +XE_CONF_DIR(fblog, [log files DIR (PREFIX)], FB_LOGDIR) +XE_CONF_DIR(fbglock, [guardian lock DIR (PREFIX)], FB_GUARDDIR) +XE_CONF_DIR(fbplugins, [plugins DIR (PREFIX)], FB_PLUGDIR, /plugins) dnl gpre built-in language support (C/C++ are mandatory) GPRE_LANGUAGE_MODULES="" |
