changeset 5776:1182d6852172

[project @ 2006-04-26 01:23:17 by jwe]
author jwe
date Wed, 26 Apr 2006 01:23:17 +0000
parents ace8d8d26933
children 246b1fc1e628
files ChangeLog Makeconf.in Makefile.in octMakefile.in
diffstat 4 files changed, 26 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-25  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (TARGETS): Include run-octave and .gdbinit in the list.
+	* Makeconf.in (subst-script-vals): New macro.
+	* octMakefile.in (run-octave, .gdbinit): New rules.
+	(DISTFILES): Include run-octave.in and gdbinit.in in the list.
+
 2006-04-17  John W. Eaton  <jwe@octave.org>
 
 	* mk-opts.pl (emit_print_function): Emit code that uses
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -557,6 +557,15 @@
 $(top_srcdir)/move-if-change $@-t $@
 endef
 
+define do-subst-script-vals
+echo "making $@ from $<"
+$(SED) < $< \
+  -e "s|%srcdir%|${srcdir}|" \
+  -e "s|%top_srcdir%|${top_srcdir}|" \
+  -e "s|%builddir%|$(shell pwd)|" > $@-t
+$(top_srcdir)/move-if-change $@-t $@
+endef
+
 define do-mkpkgadd
 $(top_srcdir)/mkpkgadd $(srcdir) > PKG_ADD.t
 if [ -n "`cat PKG_ADD.t`" ]; then \
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,8 @@
 TARGETS = octave-bug octave-config mkoctfile libcruft liboctave \
 	dlfcn readline src scripts doc check octave.info \
 	INSTALL.OCTAVE BUGS install install-strip uninstall \
-	tags TAGS dist conf-dist snapshot snapshot-version
+	tags TAGS dist conf-dist snapshot snapshot-version \
+	.gdbinit run-octave
 
 NO_DEP_TARGETS = clean mostlyclean distclean maintainer-clean
 
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -29,7 +29,7 @@
 	README.MachTen README.kpathsea ROADMAP SENDING-PATCHES \
 	THANKS move-if-change octave-sh octave-bug.in \
 	octave-config.in mk-opts.pl mkinstalldirs \
-	mkoctfile.in ChangeLog ChangeLog.[0-9]
+	mkoctfile.in run-octave.in gdbinit.in ChangeLog ChangeLog.[0-9]
 
 # Complete directory trees to distribute.
 DISTDIRS = # plplot
@@ -81,6 +81,13 @@
 	@$(do-subst-config-vals)
 	chmod a+rx $@
 
+run-octave: run-octave.in Makeconf octMakefile
+	@$(do-subst-script-vals)
+	chmod a+rx "$@"
+
+.gdbinit: gdbinit.in Makeconf octMakefile
+	$(do-subst-script-vals)
+
 check:
 	$(MAKE) -C test check
 .PHONY: check