fix autoconf and Makefile
do not delete config.sub and config.guess todo: remove misc/config.{sub|guess} ?
This commit is contained in:
parent
5378ef1c87
commit
edd5818355
2
Makefile
2
Makefile
@ -79,8 +79,6 @@ distclean: clean
|
||||
$(RM) test/`basename $$file .fl`.h; \
|
||||
done
|
||||
$(RM) -rf autom4te.cache/
|
||||
$(RM) config.guess
|
||||
$(RM) config.sub
|
||||
$(RM) configure
|
||||
|
||||
fltk-config: configure configh.in fltk-config.in
|
||||
|
@ -1253,7 +1253,7 @@ AC_SUBST([CAT3EXT])
|
||||
AC_SUBST([CAT6EXT])
|
||||
|
||||
dnl Fix "mandir" variable...
|
||||
AS_IF([test "$mandir" = "\${prefix}/man" -a "$prefix" = "/usr"]. [
|
||||
AS_IF([test "$mandir" = "\${prefix}/man" -a "$prefix" = "/usr"], [
|
||||
AS_CASE(["$host_os"], [*bsd* | darwin* | linux*], [
|
||||
# *BSD, Darwin, and Linux
|
||||
mandir="\${prefix}/share/man"
|
||||
@ -1507,7 +1507,8 @@ AS_CASE([$host_os], [darwin*], [
|
||||
dnl Define the FLTK documentation directory...
|
||||
AS_CASE([$host_os], [mingw*], [
|
||||
# Determine the path where MSys has /usr installed
|
||||
msyspath="$(mount | grep '\/usr ' | cut -d ' ' -f -1 | sed -e 's/\\\/\// g')"
|
||||
msyspath="$(mount | grep '/usr ' | cut -d ' ' -f -1 | sed -e's,\\,/, g')"
|
||||
|
||||
# Then substitute that in the Windows path instead of /usr
|
||||
AC_DEFINE_UNQUOTED([FLTK_DOCDIR], "$msyspath/local/share/doc/fltk")
|
||||
], [*], [
|
||||
|
Loading…
Reference in New Issue
Block a user