Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 56181 | Differences between
and this patch

Collapse All | Expand All

(-)old_configure (-4 / +10 lines)
Lines 18-23 Link Here
18
new_args=""
18
new_args=""
19
export new_args
19
export new_args
20
prefix=/usr/local
20
prefix=/usr/local
21
install_prefix=$prefix
21
export prefix
22
export prefix
22
23
23
for i in "$@"; do
24
for i in "$@"; do
Lines 26-31 Link Here
26
    --with-stklos) scheme=stklos; use_stklos=1;;
27
    --with-stklos) scheme=stklos; use_stklos=1;;
27
    --prefix=*) prefix=`echo $i | sed 's/^[^=]*=//'`;
28
    --prefix=*) prefix=`echo $i | sed 's/^[^=]*=//'`;
28
                new_args="$new_args $i";;
29
                new_args="$new_args $i";;
30
    --install_prefix=*) install_prefix=`echo $i | sed 's/^[^=]*=//'`;;
31
#	  new_args="$new_args $i";;
29
    *) new_args="$new_args \"$i\"";;
32
    *) new_args="$new_args \"$i\"";;
30
  esac
33
  esac
31
done
34
done
Lines 63-71 Link Here
63
# Common configuration
66
# Common configuration
64
release="1.1b"
67
release="1.1b"
65
skribeurl="http://www.inria.fr/mimosa/fp/Skribe"
68
skribeurl="http://www.inria.fr/mimosa/fp/Skribe"
66
skribeextdir="$prefix/share/skribe/extensions"
69
skribeextdir="$install_prefix/share/skribe/extensions"
67
skribedocdir=$prefix/doc/skribe-$release
70
skribedocdir=$install_prefix/doc/skribe-$release
68
skribeskrdir="'(\".\" \"$skribeextdir\" \"$prefix/share/skribe/$release/skr\" )"
71
skribeskrdir="'(\".\" \"$skribeextdir\" \"$install_prefix/share/skribe/$release/skr\" )"
69
72
70
# etc/config
73
# etc/config
71
rm -f etc/config 2> /dev/null
74
rm -f etc/config 2> /dev/null
Lines 73-84 Link Here
73
echo "release=$release" >> etc/config
76
echo "release=$release" >> etc/config
74
echo "skribeurl=$skribeurl" >> etc/config
77
echo "skribeurl=$skribeurl" >> etc/config
75
echo "prefix=$prefix" >> etc/config
78
echo "prefix=$prefix" >> etc/config
79
echo "install_prefix=$install_prefix" >> etc/config
76
80
77
# etc/skribe-config
81
# etc/skribe-config
78
cat etc/skribe-config.in \
82
cat etc/skribe-config.in \
79
    | sed "s|@SKRIBE_RELEASE@|$release|" \
83
    | sed "s|@SKRIBE_RELEASE@|$release|" \
80
    | sed "s|@PREFIX@|$prefix|" \
84
    | sed "s|@PREFIX@|$prefix|" \
81
    | sed "s|@SKRIBE_SKR_DIR@|$prefix/share/skribe/$release/skr|" \
85
    | sed "s|@INSTALL_PREFIX@|$install_prefix|" \
86
    | sed "s|@SKRIBE_SKR_DIR@|$install_prefix/share/skribe/$release/skr|" \
82
    | sed "s|@SKRIBE_EXT_DIR@|$skribeextdir|" \
87
    | sed "s|@SKRIBE_EXT_DIR@|$skribeextdir|" \
83
    | sed "s|@SKRIBE_DOC_DIR@|$skribedocdir|" \
88
    | sed "s|@SKRIBE_DOC_DIR@|$skribedocdir|" \
84
    | sed "s|@SYSTEM@|$scheme|" \
89
    | sed "s|@SYSTEM@|$scheme|" \
Lines 88-93 Link Here
88
cat emacs/skribe.el.in \
93
cat emacs/skribe.el.in \
89
    | sed "s|@SKRIBE_RELEASE@|$release|" \
94
    | sed "s|@SKRIBE_RELEASE@|$release|" \
90
    | sed "s|@PREFIX@|$prefix|" \
95
    | sed "s|@PREFIX@|$prefix|" \
96
    | sed "s|@INSTALL_PREFIX@|$install_prefix|" \
91
    | sed "s|@SKRIBE_EXT_DIR@|$skribeextdir|" \
97
    | sed "s|@SKRIBE_EXT_DIR@|$skribeextdir|" \
92
    | sed "s|@SYSTEM@|$scheme|" \
98
    | sed "s|@SYSTEM@|$scheme|" \
93
    | sed "s|@SKRIBE_DOCDIR@|$skribedocdir|" \
99
    | sed "s|@SKRIBE_DOCDIR@|$skribedocdir|" \

Return to bug 56181