From: <ai...@us...> - 2014-05-18 22:06:01
|
Revision: 13124 http://sourceforge.net/p/plplot/code/13124 Author: airwin Date: 2014-05-18 22:05:54 +0000 (Sun, 18 May 2014) Log Message: ----------- Use specific (bash) shell for the traditional (Makefile + pkg-config) build system Makefiles for the installed examples. This solves potential bugs where bashisms in these Makefiles would lead to errors for systems where the default shell used by by the make command is not bash. Modified Paths: -------------- trunk/examples/Makefile.examples.in trunk/examples/ada/Makefile.examples.in trunk/examples/c/Makefile.examples.in trunk/examples/c++/Makefile.examples.in trunk/examples/d/Makefile.examples.in trunk/examples/f95/Makefile.examples.in trunk/examples/java/Makefile.examples.in trunk/examples/ocaml/Makefile.examples.in trunk/examples/tk/Makefile.examples.in Modified: trunk/examples/Makefile.examples.in =================================================================== --- trunk/examples/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -25,6 +25,7 @@ # It combines building all the examples that need to be built along # with testing all examples. +SHELL = @SH_EXECUTABLE@ all: c/x01c@EXEEXT@ c/x01c@EXEEXT@: cd c; $(MAKE) Modified: trunk/examples/ada/Makefile.examples.in =================================================================== --- trunk/examples/ada/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/ada/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ GNAT_EXECUTABLE_BUILDER = @GNAT_EXECUTABLE_BUILDER@ \ -aI@ADA_INCLUDE_DIR@ -aL@ADA_LIB_DIR@ EXEEXT = @EXEEXT@ Modified: trunk/examples/c/Makefile.examples.in =================================================================== --- trunk/examples/c/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/c/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ CC = @CC@ EXEEXT = @EXEEXT@ Modified: trunk/examples/c++/Makefile.examples.in =================================================================== --- trunk/examples/c++/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/c++/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ CXX = @CXX@ EXEEXT = @EXEEXT@ Modified: trunk/examples/d/Makefile.examples.in =================================================================== --- trunk/examples/d/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/d/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -19,6 +19,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ DC = @DC@ EXEEXT = @EXEEXT@ Modified: trunk/examples/f95/Makefile.examples.in =================================================================== --- trunk/examples/f95/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/f95/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ F95 = @FC@ EXEEXT = @EXEEXT@ Modified: trunk/examples/java/Makefile.examples.in =================================================================== --- trunk/examples/java/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/java/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -19,6 +19,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ JAVAC = @JAVAC@ PLPLOT_CLASSPATH = @JAVADATA_HARDDIR@/plplot.jar Modified: trunk/examples/ocaml/Makefile.examples.in =================================================================== --- trunk/examples/ocaml/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/ocaml/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ OCAMLC = @OCAML_EXAMPLE_COMPILER@ EXEEXT = @EXEEXT@ Modified: trunk/examples/tk/Makefile.examples.in =================================================================== --- trunk/examples/tk/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/tk/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -20,6 +20,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ CC = @CC@ EXEEXT = @EXEEXT@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |