diff -Naur bluefish-1.0/configure.ac bluefish-1.0.new/configure.ac --- bluefish-1.0/configure.ac 2005-01-12 23:39:19 +0300 +++ bluefish-1.0.new/configure.ac 2005-01-25 16:53:37 +0300 @@ -389,23 +389,7 @@ if test "${FDMENU}" != "no" ; then if test "${FDMENU}" = "yes" ; then echo -n "checking freedesktop.org menu directory... " - if test -d /usr/share/applications ; then FDMENU=/usr/share/applications - else - if test -d ${prefix}/share/applications ; then - FDMENU=${prefix}/share/applications - else - if test -d /usr/X11R6/share/gnome/applications ; then - FDMENU=/usr/X11R6/share/gnome/applications - else - if test -d ${prefix}/share/gnome/applications ; then - FDMENU=${prefix}/share/gnome/applications - else - FDMENU=no - fi - fi - fi - fi echo $FDMENU fi if test "${FDMENU}" != "no" ; then @@ -428,23 +412,7 @@ if test "${FDMIME}" != "no" ; then if test "${FDMIME}" = "yes" ; then echo -n "checking freedesktop.org mime directory... " - if test -d /usr/share/mime ; then FDMIME=/usr/share/mime - else - if test -d ${prefix}/share/mime ; then - FDMIME=${prefix}/share/mime - else - if test -d /usr/X11R6/share/gnome/mime ; then - FDMIME=/usr/X11R6/share/gnome/mime - else - if test -d ${prefix}/share/gnome/mime ; then - FDMIME=${prefix}/share/gnome/mime - else - FDMIME=no - fi - fi - fi - fi echo ${FDMIME} fi if test "${FDMIME}" != "no" ; then @@ -467,24 +435,7 @@ if test "${GMIMEINFO}" != "no" ; then if test "${GMIMEINFO}" = "yes" ; then echo -n "checking gnome 2.4 mime-info directory... " - if test -d /usr/share/mime-info ; then GMIMEINFO=/usr/share/mime-info - else - if test -d ${prefix}/share/mime-info ; then - GMIMEINFO=${prefix}/share/mime-info - else - # FreeBSD defaults to: - if test -d /usr/X11R6/share/gnome/mime-info ; then - GMIMEINFO=/usr/X11R6/share/gnome/mime-info - else - if test -d ${prefix}/share/gnome/mime-info ; then - GMIMEINFO=${prefix}/share/gnome/mime-info - else - GMIMEINFO=no - fi - fi - fi - fi echo $GMIMEINFO fi if test "${GMIMEINFO}" != "no" ; then @@ -502,24 +453,7 @@ if test "${GAPPREG}" != "no" ; then if test "${GAPPREG}" = "yes" ; then echo -n "checking gnome 2.4 application-registry directory... " - if test -d /usr/share/application-registry ; then GAPPREG=/usr/share/application-registry - else - if test -d ${prefix}/share/application-registry ; then - GAPPREG=${prefix}/share/application-registry - else - # FreeBSD defaults to: - if test -d /usr/X11R6/share/gnome/application-registry ; then - GAPPREG=/usr/X11R6/share/gnome/application-registry - else - if test -d ${prefix}/share/gnome/application-registry ; then - GAPPREG=${prefix}/share/gnome/application-registry - else - GAPPREG=no - fi - fi - fi - fi echo $GAPPREG fi if test "${GAPPREG}" != "no" ; then @@ -539,26 +473,7 @@ if test "x${ICONPATH}" = "xyes" ; then echo -n "checking icon path... " # the default answer is yes, so this is for users that did not use theicon-path option at all - if test -d /usr/share/pixmaps ; then ICONPATH=/usr/share/pixmaps - else - if test -d ${prefix}/share/pixmaps ; then - ICONPATH=${prefix}/share/pixmaps - else - # FreeBSD defaults to: - if test -d /usr/X11R6/share/gnome/pixmaps ; then - ICONPATH=/usr/X11R6/share/gnome/pixmaps - else - if test -d ${prefix}/share/gnome/pixmaps ; then - ICONPATH=${prefix}/share/gnome/pixmaps - else - # the user did not specify an icon-path, and the default path seems to be wrong for this system - # we will not install an icon - ICONPATH=no - fi - fi - fi - fi echo $ICONPATH fi if test "${ICONPATH}" != "no" ; then