# HG changeset patch # User John Donoghue # Date 1427300723 14400 # Node ID 4840fc43f0b5481a92840e7965026076651aa957 # Parent 8f59e3cca4e7036528c0eefd357ff232c3124ee9 octave-config: add EXEEXT and SHLEXT variables to -p * build-aux/common.mk (do_subst_default_vals) Add OCTAVE_EXEEXT and OCTAVE_SHLEXT * src/octave-config.in.cc (help_msg): add string EXEEXT, SHLEXT to help string (initialize): initialize variables for EXEEXT, SHLEXT diff -r 8f59e3cca4e7 -r 4840fc43f0b5 build-aux/common.mk --- a/build-aux/common.mk Wed Mar 25 21:18:37 2015 +0100 +++ b/build-aux/common.mk Wed Mar 25 12:25:23 2015 -0400 @@ -843,6 +843,7 @@ -e "s|%OCTAVE_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ -e "s|%OCTAVE_DOC_CACHE_FILE%|\"${doc_cache_file}\"|" \ -e "s|%OCTAVE_EXEC_PREFIX%|\"${exec_prefix}\"|" \ + -e "s|%OCTAVE_EXEEXT%|\"${EXEEXT}\"|" \ -e "s|%OCTAVE_FCNFILEDIR%|\"${fcnfiledir}\"|" \ -e "s|%OCTAVE_IMAGEDIR%|\"${imagedir}\"|" \ -e "s|%OCTAVE_INCLUDEDIR%|\"${includedir}\"|" \ @@ -874,6 +875,7 @@ -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \ -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \ -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \ + -e "s|%OCTAVE_SHLEXT%|\"${SHLEXT}\"|" \ -e "s|%OCTAVE_TEXI_MACROS_FILE%|\"${texi_macros_file}\"|" \ -e "s|%OCTAVE_VERSION%|\"${version}\"|" && \ $(simple_move_if_change_rule) diff -r 8f59e3cca4e7 -r 4840fc43f0b5 src/octave-config.in.cc --- a/src/octave-config.in.cc Wed Mar 25 21:18:37 2015 +0100 +++ b/src/octave-config.in.cc Wed Mar 25 12:25:23 2015 -0400 @@ -64,13 +64,14 @@ " DATAROOTDIR LOCALVERFCNFILEDIR\n" " DEFAULT_PAGER LOCALVEROCTFILEDIR\n" " EXEC_PREFIX MAN1DIR\n" -" FCNFILEDIR MAN1EXT\n" -" IMAGEDIR MANDIR\n" -" INCLUDEDIR OCTDATADIR\n" -" INFODIR OCTFILEDIR\n" -" INFOFILE OCTINCLUDEDIR\n" -" LIBDIR OCTLIBDIR\n" -" LIBEXECDIR PREFIX\n" +" EXEEXT MAN1EXT\n" +" FCNFILEDIR MANDIR\n" +" IMAGEDIR OCTDATADIR\n" +" INCLUDEDIR OCTFILEDIR\n" +" INFODIR OCTINCLUDEDIR\n" +" INFOFILE OCTLIBDIR\n" +" LIBDIR PREFIX\n" +" LIBEXECDIR SHLEXT\n" " LOCALAPIARCHLIBDIR STARTUPFILEDIR\n" " LOCALAPIFCNFILEDIR VERSION\n" " LOCALAPIOCTFILEDIR\n" @@ -95,6 +96,7 @@ vars["DATADIR"] = subst_octave_home (%OCTAVE_DATADIR%); vars["DATAROOTDIR"] = subst_octave_home (%OCTAVE_DATAROOTDIR%); vars["EXEC_PREFIX"] = subst_octave_home (%OCTAVE_EXEC_PREFIX%); + vars["EXEEXT"] = subst_octave_home (%OCTAVE_EXEEXT%); vars["FCNFILEDIR"] = subst_octave_home (%OCTAVE_FCNFILEDIR%); vars["IMAGEDIR"] = subst_octave_home (%OCTAVE_IMAGEDIR%); vars["INCLUDEDIR"] = subst_octave_home (%OCTAVE_INCLUDEDIR%); @@ -118,6 +120,7 @@ vars["OCTFILEDIR"] = subst_octave_home (%OCTAVE_OCTFILEDIR%); vars["OCTINCLUDEDIR"] = subst_octave_home (%OCTAVE_OCTINCLUDEDIR%); vars["OCTLIBDIR"] = subst_octave_home (%OCTAVE_OCTLIBDIR%); + vars["SHLEXT"] = subst_octave_home (%OCTAVE_SHLEXT%); vars["STARTUPFILEDIR"] = subst_octave_home (%OCTAVE_STARTUPFILEDIR%); }