projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5c96d46
)
install-sh????
author
ivan
<ivan>
Thu, 31 Dec 2009 14:08:10 +0000
(14:08 +0000)
committer
ivan
<ivan>
Thu, 31 Dec 2009 14:08:10 +0000
(14:08 +0000)
rt/Makefile
patch
|
blob
|
history
rt/config.status
patch
|
blob
|
history
diff --git
a/rt/Makefile
b/rt/Makefile
index
01a8838
..
5be4f60
100644
(file)
--- a/
rt/Makefile
+++ b/
rt/Makefile
@@
-52,7
+52,7
@@
PERL = /usr/bin/perl
PERL = /usr/bin/perl
-INSTALL = install
-sh
+INSTALL = install
RT_LAYOUT = relative
RT_LAYOUT = relative
diff --git
a/rt/config.status
b/rt/config.status
index
a564ed6
..
3abecf4
100755
(executable)
--- a/
rt/config.status
+++ b/
rt/config.status
@@
-249,10
+249,25
@@
exec 6>&1
# Open the log real soon, to keep \$[0] and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# Open the log real soon, to keep \$[0] and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
+<<<<<<< config.status
+# values after options handling. Logging --version etc. is OK.
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by RT $as_me 3.6.6, which was
+generated by GNU Autoconf 2.59. Invocation command line was
+=======
# values after options handling.
ac_log="
This file was extended by RT $as_me 3.8.7, which was
generated by GNU Autoconf 2.64. Invocation command line was
# values after options handling.
ac_log="
This file was extended by RT $as_me 3.8.7, which was
generated by GNU Autoconf 2.64. Invocation command line was
+>>>>>>> 1.4
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@
-285,9
+300,15
@@
$config_files
Report bugs to <bug-autoconf@gnu.org>."
ac_cs_version="\
Report bugs to <bug-autoconf@gnu.org>."
ac_cs_version="\
+<<<<<<< config.status
+RT config.status 3.6.6
+configured by ./configure, generated by GNU Autoconf 2.59,
+ with options \"'--enable-layout=Freeside' '--with-db-type=Pg' '--with-db-dba=freeside' '--with-db-database=freeside' '--with-db-rt-user=freeside' '--with-db-rt-pass=' '--with-web-user=freeside' '--with-web-group=freeside' '--with-rt-group=freeside'\"
+=======
RT config.status 3.8.7
configured by ./configure, generated by GNU Autoconf 2.64,
with options \"'--with-db-type=SQLite' '--enable-layout=relative' '--with-web-handler=standalone' 'PERL=/usr/bin/perl'\"
RT config.status 3.8.7
configured by ./configure, generated by GNU Autoconf 2.64,
with options \"'--with-db-type=SQLite' '--enable-layout=relative' '--with-web-handler=standalone' 'PERL=/usr/bin/perl'\"
+>>>>>>> 1.4
Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
@@
-295,7
+316,7
@@
gives unlimited permission to copy, distribute and modify it."
ac_pwd='/Users/falcone/work/rt/releases/rt-3.8.7'
srcdir='.'
ac_pwd='/Users/falcone/work/rt/releases/rt-3.8.7'
srcdir='.'
-INSTALL='install
-sh
'
+INSTALL='install'
AWK='gawk'
test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file.
AWK='gawk'
test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file.
@@
-640,8
+661,8
@@
s,@SHELL@,/bin/sh,;t t
s,@PATH_SEPARATOR@,:,;t t
s,@PACKAGE_NAME@,RT,;t t
s,@PACKAGE_TARNAME@,rt,;t t
s,@PATH_SEPARATOR@,:,;t t
s,@PACKAGE_NAME@,RT,;t t
s,@PACKAGE_TARNAME@,rt,;t t
-s,@PACKAGE_VERSION@,3.6.
4
,;t t
-s,@PACKAGE_STRING@,RT 3.6.
4
,;t t
+s,@PACKAGE_VERSION@,3.6.
6
,;t t
+s,@PACKAGE_STRING@,RT 3.6.
6
,;t t
s,@PACKAGE_BUGREPORT@,rt-bugs@bestpractical.com,;t t
s,@exec_prefix@,/opt/rt3,;t t
s,@prefix@,/opt/rt3,;t t
s,@PACKAGE_BUGREPORT@,rt-bugs@bestpractical.com,;t t
s,@exec_prefix@,/opt/rt3,;t t
s,@prefix@,/opt/rt3,;t t
@@
-661,18
+682,18
@@
s,@mandir@,/opt/rt3/man,;t t
s,@build_alias@,,;t t
s,@host_alias@,,;t t
s,@target_alias@,,;t t
s,@build_alias@,,;t t
s,@host_alias@,,;t t
s,@target_alias@,,;t t
-s,@DEFS@,-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.6.
4\" -DPACKAGE_STRING=\"RT\ 3.6.4
\" -DPACKAGE_BUGREPORT=\"rt-bugs@bestpractical.com\" ,;t t
+s,@DEFS@,-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.6.
6\" -DPACKAGE_STRING=\"RT\ 3.6.6
\" -DPACKAGE_BUGREPORT=\"rt-bugs@bestpractical.com\" ,;t t
s,@ECHO_C@,,;t t
s,@ECHO_N@,-n,;t t
s,@ECHO_T@,,;t t
s,@LIBS@,,;t t
s,@rt_version_major@,3,;t t
s,@rt_version_minor@,6,;t t
s,@ECHO_C@,,;t t
s,@ECHO_N@,-n,;t t
s,@ECHO_T@,,;t t
s,@LIBS@,,;t t
s,@rt_version_major@,3,;t t
s,@rt_version_minor@,6,;t t
-s,@rt_version_patch@,
4
,;t t
+s,@rt_version_patch@,
6
,;t t
s,@INSTALL_PROGRAM@,${INSTALL},;t t
s,@INSTALL_SCRIPT@,${INSTALL},;t t
s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
s,@INSTALL_PROGRAM@,${INSTALL},;t t
s,@INSTALL_SCRIPT@,${INSTALL},;t t
s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
-s,@AWK@,
g
awk,;t t
+s,@AWK@,
m
awk,;t t
s,@PERL@,/usr/bin/perl,;t t
s,@SPEEDY_BIN@,/usr/local/bin/speedy,;t t
s,@exp_prefix@,/opt/rt3,;t t
s,@PERL@,/usr/bin/perl,;t t
s,@SPEEDY_BIN@,/usr/local/bin/speedy,;t t
s,@exp_prefix@,/opt/rt3,;t t
@@
-720,12
+741,12
@@
s,@DB_RT_PASS@,,;t t
s,@WEB_USER@,freeside,;t t
s,@WEB_GROUP@,freeside,;t t
s,@RTGROUP@,freeside,;t t
s,@WEB_USER@,freeside,;t t
s,@WEB_GROUP@,freeside,;t t
s,@RTGROUP@,freeside,;t t
-s,@APACHECTL@,
/usr/sbin/apachectl
,;t t
+s,@APACHECTL@,,;t t
s,@RT_STANDALONE@,0,;t t
s,@RT_DEVEL_MODE@,0,;t t
s,@RT_VERSION_MAJOR@,3,;t t
s,@RT_VERSION_MINOR@,6,;t t
s,@RT_STANDALONE@,0,;t t
s,@RT_DEVEL_MODE@,0,;t t
s,@RT_VERSION_MAJOR@,3,;t t
s,@RT_VERSION_MINOR@,6,;t t
-s,@RT_VERSION_PATCH@,
4
,;t t
+s,@RT_VERSION_PATCH@,
6
,;t t
s,@RT_PATH@,/opt/rt3,;t t
s,@RT_DOC_PATH@,/opt/rt3/share/doc,;t t
s,@RT_LOCAL_PATH@,/opt/rt3/local,;t t
s,@RT_PATH@,/opt/rt3,;t t
s,@RT_DOC_PATH@,/opt/rt3/share/doc,;t t
s,@RT_LOCAL_PATH@,/opt/rt3/local,;t t