summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorClément DAVID <clement.david@esi-group.com>2021-04-29 17:03:27 +0200
committerClément David <clement.david@esi-group.com>2021-04-30 09:38:22 +0200
commit5a1009b708a21aff8da694a0b7cedaf642287e40 (patch)
treecee6b39ce7720a40c7a3faf836b05050229af697 /scilab/modules
parentd93530298568019a940e22291608fcd919c9488e (diff)
downloadscilab-5a1009b708a21aff8da694a0b7cedaf642287e40.zip
scilab-5a1009b708a21aff8da694a0b7cedaf642287e40.tar.gz
core: remove getwd alias for getcwd
Needed to pass configure and make on Fedora 34. It also update previously modified files with the correct automake version. Change-Id: Ie29b1acc7e85ed6c054c13a1ee2188a5149b6b07
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/console/Makefile.in12
-rw-r--r--scilab/modules/core/Makefile.in6
-rw-r--r--scilab/modules/core/includes/machine.h.in6
-rw-r--r--scilab/modules/core/includes/machine.h.vc3
-rw-r--r--scilab/modules/javasci/Makefile.in4
5 files changed, 10 insertions, 21 deletions
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 0be2453..52931cf 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am. 1# Makefile.in generated by automake 1.16.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2020 Free Software Foundation, Inc. 4# Copyright (C) 1994-2018 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
@@ -531,8 +531,8 @@ MKDIR_P = @MKDIR_P@
531MPI_ENABLE = @MPI_ENABLE@ 531MPI_ENABLE = @MPI_ENABLE@
532MSGCAT = @MSGCAT@ 532MSGCAT = @MSGCAT@
533MSGFMT = @MSGFMT@ 533MSGFMT = @MSGFMT@
534MSGFMT_015 = @MSGFMT_015@
534MSGMERGE = @MSGMERGE@ 535MSGMERGE = @MSGMERGE@
535MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
536NM = @NM@ 536NM = @NM@
537NMEDIT = @NMEDIT@ 537NMEDIT = @NMEDIT@
538OBJDUMP = @OBJDUMP@ 538OBJDUMP = @OBJDUMP@
@@ -1738,8 +1738,7 @@ installdirs:
1738 done 1738 done
1739install: $(BUILT_SOURCES) 1739install: $(BUILT_SOURCES)
1740 $(MAKE) $(AM_MAKEFLAGS) install-am 1740 $(MAKE) $(AM_MAKEFLAGS) install-am
1741install-exec: $(BUILT_SOURCES) 1741install-exec: install-exec-am
1742 $(MAKE) $(AM_MAKEFLAGS) install-exec-am
1743install-data: install-data-am 1742install-data: install-data-am
1744uninstall: uninstall-am 1743uninstall: uninstall-am
1745 1744
@@ -1941,8 +1940,7 @@ uninstall-am: uninstall-libsciconsole_la_etcDATA \
1941 uninstall-libsciconsole_la_rootDATA \ 1940 uninstall-libsciconsole_la_rootDATA \
1942 uninstall-pkglibLTLIBRARIES 1941 uninstall-pkglibLTLIBRARIES
1943 1942
1944.MAKE: all check check-am install install-am install-exec \ 1943.MAKE: all check check-am install install-am install-strip
1945 install-strip
1946 1944
1947.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ 1945.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
1948 check-am check-local clean clean-generic clean-libtool \ 1946 check-am check-local clean clean-generic clean-libtool \
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 0eb9e4b..6b9abee 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am. 1# Makefile.in generated by automake 1.16.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2020 Free Software Foundation, Inc. 4# Copyright (C) 1994-2018 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
@@ -739,8 +739,8 @@ MKDIR_P = @MKDIR_P@
739MPI_ENABLE = @MPI_ENABLE@ 739MPI_ENABLE = @MPI_ENABLE@
740MSGCAT = @MSGCAT@ 740MSGCAT = @MSGCAT@
741MSGFMT = @MSGFMT@ 741MSGFMT = @MSGFMT@
742MSGFMT_015 = @MSGFMT_015@
742MSGMERGE = @MSGMERGE@ 743MSGMERGE = @MSGMERGE@
743MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
744NM = @NM@ 744NM = @NM@
745NMEDIT = @NMEDIT@ 745NMEDIT = @NMEDIT@
746OBJDUMP = @OBJDUMP@ 746OBJDUMP = @OBJDUMP@
diff --git a/scilab/modules/core/includes/machine.h.in b/scilab/modules/core/includes/machine.h.in
index dad55ae..4f83b03 100644
--- a/scilab/modules/core/includes/machine.h.in
+++ b/scilab/modules/core/includes/machine.h.in
@@ -143,9 +143,6 @@
143/* Define to 1 if you have the `gettimeofday' function. */ 143/* Define to 1 if you have the `gettimeofday' function. */
144#undef HAVE_GETTIMEOFDAY 144#undef HAVE_GETTIMEOFDAY
145 145
146/* Define to 1 if you have the `getwd' function. */
147#undef HAVE_GETWD
148
149/* HAVE_GLIBC_BACKTRACE */ 146/* HAVE_GLIBC_BACKTRACE */
150#undef HAVE_GLIBC_BACKTRACE 147#undef HAVE_GLIBC_BACKTRACE
151 148
@@ -565,9 +562,6 @@
565/* Define to empty if `const' does not conform to ANSI C. */ 562/* Define to empty if `const' does not conform to ANSI C. */
566#undef const 563#undef const
567 564
568/* Don't use getwd but getcwd */
569#undef getwd
570
571/* Define to `__inline__' or `__inline' if that's what the C compiler 565/* Define to `__inline__' or `__inline' if that's what the C compiler
572 calls it, or to nothing if 'inline' is not supported under any name. */ 566 calls it, or to nothing if 'inline' is not supported under any name. */
573#ifndef __cplusplus 567#ifndef __cplusplus
diff --git a/scilab/modules/core/includes/machine.h.vc b/scilab/modules/core/includes/machine.h.vc
index e2faad9..59e05c1 100644
--- a/scilab/modules/core/includes/machine.h.vc
+++ b/scilab/modules/core/includes/machine.h.vc
@@ -15,9 +15,6 @@
15/* Define if have exp10 */ 15/* Define if have exp10 */
16/* #undef HAVE_EXP10 */ 16/* #undef HAVE_EXP10 */
17 17
18/* Define if have getwd */
19#define HAVE_GETWD 1
20
21/* Define if have strerror: used in fileio/misc.c */ 18/* Define if have strerror: used in fileio/misc.c */
22#define HAVE_STRERROR 1 19#define HAVE_STRERROR 1
23 20
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index a7b90bc..4a40d1b 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -1035,10 +1035,10 @@ maintainer-clean-generic:
1035 @echo "This command is intended for maintainers to use" 1035 @echo "This command is intended for maintainers to use"
1036 @echo "it deletes files that may require special tools to rebuild." 1036 @echo "it deletes files that may require special tools to rebuild."
1037 -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) 1037 -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
1038@JAVASCI_FALSE@clean-local:
1038@JAVASCI_FALSE@install-html-local: 1039@JAVASCI_FALSE@install-html-local:
1039@JAVASCI_FALSE@install-data-local:
1040@JAVASCI_FALSE@distclean-local: 1040@JAVASCI_FALSE@distclean-local:
1041@JAVASCI_FALSE@clean-local: 1041@JAVASCI_FALSE@install-data-local:
1042clean: clean-am 1042clean: clean-am
1043 1043
1044clean-am: clean-generic clean-libtool clean-local \ 1044clean-am: clean-generic clean-libtool clean-local \