Mercurial > octave-nkf

changeset 20366:a1c2d0cd5b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix encoded source file name for builtin functions * libinterp/corefcn/module.mk (COREFCN_FT2_DF): Pass $(srcdir)/libinterp to mkdefs. * libinterp/mkdefs: Do not prepend "libinterp" to source file.
author Mike Miller <mtmiller@octave.org>
date Sat, 11 Jul 2015 23:25:37 -0400
parents d54f3d6c8741
children a6080f6152b7
files libinterp/corefcn/module.mk libinterp/mkdefs
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/module.mk	Sat Jul 11 19:14:37 2015 -0400
+++ b/libinterp/corefcn/module.mk	Sat Jul 11 23:25:37 2015 -0400
@@ -283,7 +283,7 @@
 	  $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) \
 	  $(libinterp_corefcn_libcorefcn_la_CXXFLAGS) \
 	  -DMAKE_BUILTINS $< > $@-t && \
-	$(srcdir)/libinterp/mkdefs $(srcdir) $< < $@-t > $@ && \
+	$(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t > $@ && \
 	rm $@-t
 
 ## Special rules for sources which must be built before rest of compilation.
--- a/libinterp/mkdefs	Sat Jul 11 19:14:37 2015 -0400
+++ b/libinterp/mkdefs	Sat Jul 11 23:25:37 2015 -0400
@@ -34,7 +34,7 @@
     xsrcdir=`echo "$file" | sed "s,^$srcdir,libinterp,"`
   ;;
   *)
-    xsrcdir="libinterp/$file"
+    xsrcdir="$file"
   ;;
 esac
 echo " XDEFUN_FILE_NAME (\"$xsrcdir\")"