|
Lines 14728-14734
Link Here
|
| 14728 |
# Check for the various Gnome help and URL loading programs. |
14728 |
# Check for the various Gnome help and URL loading programs. |
| 14729 |
# |
14729 |
# |
| 14730 |
if test "$have_gtk" = yes; then |
14730 |
if test "$have_gtk" = yes; then |
| 14731 |
for ac_prog in gnome-open |
14731 |
for ac_prog in gnome-terminal |
| 14732 |
do |
14732 |
do |
| 14733 |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
14733 |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
| 14734 |
set dummy $ac_prog; ac_word=$2 |
14734 |
set dummy $ac_prog; ac_word=$2 |
|
Lines 21519-21552
Link Here
|
| 21519 |
|
21519 |
|
| 21520 |
# M4 sucks!! |
21520 |
# M4 sucks!! |
| 21521 |
|
21521 |
|
| 21522 |
rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ |
|
|
| 21523 |
sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ |
| 21524 |
head -1` |
| 21525 |
|
| 21526 |
|
| 21527 |
if test \! -z "$rpmv" ; then |
| 21528 |
rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` |
| 21529 |
rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'` |
| 21530 |
|
| 21531 |
warning=no |
| 21532 |
warnL "There is already an installed RPM of xscreensaver $rpmv" |
| 21533 |
warn2 'on this system. You might want to remove it ("rpm -ve")' |
| 21534 |
warn2 'before running "make install" in this directory.' |
| 21535 |
echo "" |
| 21536 |
warn2 "Alternately, you could build this version of xscreensaver" |
| 21537 |
warn2 'as an RPM, and then install that. An "xscreensaver.spec"' |
| 21538 |
warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' |
| 21539 |
warn2 "See the RPM documentation for more info." |
| 21540 |
echo "" |
| 21541 |
|
| 21542 |
if test "$rpmbdir" = "$rpmhdir" ; then |
| 21543 |
warn2 "The RPM version was installed in $rpmbdir/." |
| 21544 |
do_dir_warning=yes |
| 21545 |
else |
| 21546 |
warn2 "The RPM version was installed in $rpmbdir/," |
| 21547 |
warn2 "with demos in $rpmhdir/." |
| 21548 |
fi |
| 21549 |
fi |
| 21550 |
fi |
21522 |
fi |
| 21551 |
|
21523 |
|
| 21552 |
if test "${bindir}" = "${HACKDIR}" ; then |
21524 |
if test "${bindir}" = "${HACKDIR}" ; then |
