mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-09 21:40:33 +02:00
* configure.in, Makefile.in: The 'install' and 'uninstall'
Makefile targets should be affected by whether or not we have a port to the current target architecture too, not just the 'all' target.
This commit is contained in:
parent
8715b33106
commit
8efd05bf65
3 changed files with 38 additions and 8 deletions
|
@ -92,14 +92,16 @@ dist-dir:
|
|||
done
|
||||
|
||||
|
||||
install: all
|
||||
install: @target_install@
|
||||
install_qt: all
|
||||
test -d $(prefix) || mkdir $(prefix)
|
||||
test -d $(libdir) || mkdir $(libdir)
|
||||
$(INSTALL) libqt.a $(libdir)/libqt.a
|
||||
$(RANLIB) $(libdir)/libqt.a
|
||||
$(INSTALL) $(srcdir)/qt.h $(includedir);
|
||||
|
||||
uninstall:
|
||||
uninstall: @target_uninstall@
|
||||
uninstall_qt:
|
||||
-rm -f $(libdir)/libqt.a
|
||||
-rm -f $(includedir)/qt.h
|
||||
|
||||
|
|
21
qt/configure
vendored
21
qt/configure
vendored
|
@ -964,9 +964,9 @@ fi
|
|||
echo "$ac_t""$cy_cv_threads_package" 1>&6
|
||||
|
||||
|
||||
target_all=
|
||||
threads_enabled=false
|
||||
if test "$cy_cv_threads_package" = COOP; then
|
||||
target_all=libqt.a
|
||||
threads_enabled=true
|
||||
fi
|
||||
|
||||
# Determine the host we are working on
|
||||
|
@ -1029,11 +1029,24 @@ sparc-*-*)
|
|||
;;
|
||||
*)
|
||||
echo "Unknown configuration; threads package disabled"
|
||||
target_all=''
|
||||
threads_enabled=false
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
if $threads_enabled; then
|
||||
target_all=libqt.a
|
||||
target_install=install_qt
|
||||
target_uninstall=uninstall_qt
|
||||
else
|
||||
target_all=''
|
||||
target_install=''
|
||||
target_uninstall=''
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1179,6 +1192,8 @@ s%@host_cpu@%$host_cpu%g
|
|||
s%@host_vendor@%$host_vendor%g
|
||||
s%@host_os@%$host_os%g
|
||||
s%@target_all@%$target_all%g
|
||||
s%@target_install@%$target_install%g
|
||||
s%@target_uninstall@%$target_uninstall%g
|
||||
s%@qtmd_h@%$qtmd_h%g
|
||||
s%@qtmdc_c@%$qtmdc_c%g
|
||||
s%@qtmds_s@%$qtmds_s%g
|
||||
|
|
|
@ -12,9 +12,9 @@ AC_CONFIG_AUX_DIR(..) #`cd $srcdir; pwd`/..)
|
|||
builtin(sinclude, ../aclocal.m4)
|
||||
CY_AC_WITH_THREADS
|
||||
|
||||
target_all=
|
||||
threads_enabled=false
|
||||
if test "$cy_cv_threads_package" = COOP; then
|
||||
target_all=libqt.a
|
||||
threads_enabled=true
|
||||
fi
|
||||
|
||||
# Determine the host we are working on
|
||||
|
@ -52,11 +52,24 @@ sparc-*-*)
|
|||
;;
|
||||
*)
|
||||
echo "Unknown configuration; threads package disabled"
|
||||
target_all=''
|
||||
threads_enabled=false
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
if $threads_enabled; then
|
||||
target_all=libqt.a
|
||||
target_install=install_qt
|
||||
target_uninstall=uninstall_qt
|
||||
else
|
||||
target_all=''
|
||||
target_install=''
|
||||
target_uninstall=''
|
||||
fi
|
||||
|
||||
AC_SUBST(target_all)
|
||||
AC_SUBST(target_install)
|
||||
AC_SUBST(target_uninstall)
|
||||
AC_SUBST(qtmd_h)
|
||||
AC_SUBST(qtmdc_c)
|
||||
AC_SUBST(qtmds_s)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue