Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:12:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix autoconf and Makefile

Browse Source 
do not delete config.sub and config.guess

todo: remove misc/config.{sub|guess} ?
This commit is contained in:
Albrecht Schlosser
2021-02-15 00:09:15 +01:00
parent 5378ef1c87
commit edd5818355
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
-2
View File
@@ -79,8 +79,6 @@ distclean: clean
$(RM) test/`basename $$file .fl`.h; \ $(RM) test/`basename $$file .fl`.h; \
done done
$(RM) -rf autom4te.cache/ $(RM) -rf autom4te.cache/
$(RM) config.guess
$(RM) config.sub
$(RM) configure $(RM) configure
fltk-config: configure configh.in fltk-config.in fltk-config: configure configh.in fltk-config.in
configure.ac
+3 -2
View File
@@ -1253,7 +1253,7 @@ AC_SUBST([CAT3EXT])
AC_SUBST([CAT6EXT]) AC_SUBST([CAT6EXT])
dnl Fix "mandir" variable... 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*], [ AS_CASE(["$host_os"], [*bsd* | darwin* | linux*], [
# *BSD, Darwin, and Linux # *BSD, Darwin, and Linux
mandir="\${prefix}/share/man" mandir="\${prefix}/share/man"
@@ -1507,7 +1507,8 @@ AS_CASE([$host_os], [darwin*], [
dnl Define the FLTK documentation directory... dnl Define the FLTK documentation directory...
AS_CASE([$host_os], [mingw*], [ AS_CASE([$host_os], [mingw*], [
# Determine the path where MSys has /usr installed # 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 # Then substitute that in the Windows path instead of /usr
AC_DEFINE_UNQUOTED([FLTK_DOCDIR], "$msyspath/local/share/doc/fltk") AC_DEFINE_UNQUOTED([FLTK_DOCDIR], "$msyspath/local/share/doc/fltk")
], [*], [ ], [*], [