# HG changeset patch
# User jwe
# Date 832320660 0
# Node ID 57429a64a466207c35632fb2ec4966d883a9ac68
# Parent  a2e240d3f336c17bf4819e8effe911deca7fc010
[project @ 1996-05-17 08:06:01 by jwe]

diff -r a2e240d3f336 -r 57429a64a466 Makeconf.in
--- a/Makeconf.in	Fri May 17 08:02:36 1996 +0000
+++ b/Makeconf.in	Fri May 17 08:11:00 1996 +0000
@@ -163,16 +163,17 @@
 
 # The prefix for Octave's include file directory.  The default is
 # ${prefix}/include
-topincludedir = @topincludedir@
+includedir = @includedir@
 
 # Where to install Octave's include files.  The default is
-# ${topincludedir}/octave-${version}
-includedir = @includedir@
+# ${includedir}/octave-${version}
+octincludedir = @octincludedir@
 
 # Where to install Octave's man pages, and what extension they should
 # have.  The default is ${prefix}/man/man1
 mandir = @mandir@
-manext = 1
+man1dir = @man1dir@
+man1ext = @man1ext@
 
 # Where to install and expect the info files describing Octave..
 infodir = @infodir@
@@ -294,8 +295,8 @@
 endef
 
 define do-subst-config-vals
-echo making $@ from $(srcdir)/$@.in
-sed < $(srcdir)/$@.in > $@.tmp \
+echo "making $@ from $<"
+sed < $< > $@.tmp \
   -e "s;%VERSION%;\"${version}\";" \
   -e "s;%config_opts%;\"${config_opts}\";" \
   -e "s;%TARGET_HOST_TYPE%;\"${target_host_type}\";" \
@@ -306,7 +307,7 @@
   -e "s;%F2CFLAGS%;\"${F2CFLAGS}\";" \
   -e "s;%FLIBS%;\"${FLIBS}\";" \
   -e "s;%CPPFLAGS%;\"${CPPFLAGS}\";" \
-  -e "s;%INCFLAGS%;\"-I${topincludedir} -I${includedir}\";" \
+  -e "s;%INCFLAGS%;\"-I${includedir} -I${octincludedir}\";" \
   -e "s;%CC%;\"${CC}\";" \
   -e "s;%CC_VERSION%;\"${CC_VERSION}\";" \
   -e "s;%CFLAGS%;\"${BUG_CFLAGS}\";" \
@@ -333,8 +334,8 @@
 endef
 
 define do-subst-default-vals
-echo "making $@ from $(srcdir)/$@.in"
-sed < $(srcdir)/$@.in > $@.tmp \
+echo "making $@ from $<"
+sed < $< > $@.tmp \
   -e "s;%DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
   -e "s;%OCTAVE_PREFIX%;\"${prefix}\";" \
   -e "s;%OCTAVE_EXEC_PREFIX%;\"${exec_prefix}\";" \
diff -r a2e240d3f336 -r 57429a64a466 configure.in
--- a/configure.in	Fri May 17 08:02:36 1996 +0000
+++ b/configure.in	Fri May 17 08:11:00 1996 +0000
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-AC_REVISION($Revision: 1.200 $)
+AC_REVISION($Revision: 1.201 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -39,19 +39,13 @@
 fi
 AC_SUBST(target_host_type)
 
-### some defaults
-
 AC_PREFIX_DEFAULT(/usr/local)
 
-exec_prefix='$(prefix)'
-bindir='$(exec_prefix)/bin'
-datadir='$(prefix)/share'
-libdir='$(exec_prefix)/lib'
-libexecdir='$(exec_prefix)/libexec'
-topincludedir='$(prefix)/include'
-includedir='$(topincludedir)/octave-$(version)'
-mandir='$(prefix)/man/man1'
-infodir='$(prefix)/info'
+### some defaults
+
+man1dir='$(mandir)/man1'
+man1ext='.1'
+octincludedir='$(includedir)/octave-$(version)'
 fcnfiledir='$(datadir)/octave/$(version)/m'
 localfcnfiledir='$(datadir)/octave/site/m'
 localfcnfilepath='$(localfcnfiledir)//'
@@ -72,6 +66,8 @@
 AC_MSG_RESULT([defining topincludedir to be $topincludedir])
 AC_MSG_RESULT([defining includedir to be $includedir])
 AC_MSG_RESULT([defining mandir to be $mandir])
+AC_MSG_RESULT([defining man1dir to be $man1dir])
+AC_MSG_RESULT([defining man1ext to be $man1ext])
 AC_MSG_RESULT([defining infodir to be $infodir])
 AC_MSG_RESULT([defining fcnfiledir to be $fcnfiledir])
 AC_MSG_RESULT([defining localfcnfiledir to be $localfcnfiledir])
@@ -89,9 +85,11 @@
 AC_SUBST(datadir)
 AC_SUBST(libdir)
 AC_SUBST(libexecdir)
-AC_SUBST(topincludedir)
 AC_SUBST(includedir)
+AC_SUBST(octincludedir)
 AC_SUBST(mandir)
+AC_SUBST(man1dir)
+AC_SUBST(man1ext)
 AC_SUBST(infodir)
 AC_SUBST(fcnfiledir)
 AC_SUBST(localfcnfiledir)
diff -r a2e240d3f336 -r 57429a64a466 liboctave/Makefile.in
--- a/liboctave/Makefile.in	Fri May 17 08:02:36 1996 +0000
+++ b/liboctave/Makefile.in	Fri May 17 08:11:00 1996 +0000
@@ -159,27 +159,27 @@
 .PHONY: install-lib
 
 install-inc:
-	$(top_srcdir)/mkinstalldirs $(includedir)
+	$(top_srcdir)/mkinstalldirs $(octincludedir)
 	for f in $(INCLUDES) $(TEMPLATE_SRC) ; do \
-	  rm -f $(includedir)/$$f ; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(includedir)/$$f ; \
+	  rm -f $(octincludedir)/$$f ; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/$$f ; \
 	done
-	linkdir=`echo $(includedir) | sed 's/-$(version)$$//'` ; \
-	if [ "$$linkdir" = $(includedir) ] ; then \
+	linkdir=`echo $(octincludedir) | sed 's/-$(version)$$//'` ; \
+	if [ "$$linkdir" = $(octincludedir) ] ; then \
 	  true ; \
 	else \
 	  if [ -d $$linkdir ] ; then \
 	    true ; \
 	  else \
 	    rm -f $$linkdir ; \
-	    $(LN_S) $(includedir) $$linkdir ; \
+	    $(LN_S) $(octincludedir) $$linkdir ; \
 	  fi ; \
 	fi
 .PHONY: install-inc
 
 uninstall:
 	rm -f $(libdir)/liboctave.a $(libdir)/liboctave.$(SHLEXT)
-	for f in $(INCLUDES) ; do rm -f $(includedir)/$$f ; done
+	for f in $(INCLUDES) ; do rm -f $(octincludedir)/$$f ; done
 .PHONY: uninstall
 
 tags: $(SOURCES)
diff -r a2e240d3f336 -r 57429a64a466 src/Makefile.in
--- a/src/Makefile.in	Fri May 17 08:02:36 1996 +0000
+++ b/src/Makefile.in	Fri May 17 08:11:00 1996 +0000
@@ -254,24 +254,24 @@
 .PHONY: install-lib
 
 install-inc:
-	$(top_srcdir)/mkinstalldirs $(includedir)
+	$(top_srcdir)/mkinstalldirs $(octincludedir)
 	for f in $(INCLUDES) ; do \
-	  rm -f $(includedir)/$$f ; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(includedir)/$$f ; \
+	  rm -f $(octincludedir)/$$f ; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/$$f ; \
 	done
 	for f in defaults.h oct-conf.h oct-gperf.h ; do \
-	  rm -f $(includedir)/$$f ; \
-	  $(INSTALL_DATA) $$f $(includedir)/$$f ; \
+	  rm -f $(octincludedir)/$$f ; \
+	  $(INSTALL_DATA) $$f $(octincludedir)/$$f ; \
 	done
-	linkdir=`echo $(includedir) | sed 's/-$(version)$$//'` ; \
-	if [ "$$linkdir" = $(includedir) ] ; then \
+	linkdir=`echo $(octincludedir) | sed 's/-$(version)$$//'` ; \
+	if [ "$$linkdir" = $(octincludedir) ] ; then \
 	  true ; \
 	else \
 	  if [ -d $$linkdir ] ; then \
 	    true ; \
 	  else \
 	    rm -f $$linkdir ; \
-	    $(LN_S) $(includedir) $$linkdir ; \
+	    $(LN_S) $(octincludedir) $$linkdir ; \
 	  fi ; \
 	fi
 .PHONY: install-lib
@@ -280,7 +280,7 @@
 	rm -f $(bindir)/octave
 	for f in $(LIBS_TO_INSTALL); do rm -f $(libdir)/$$f; done
 	for f in $(INCLUDES) defaults.h oct-conf.h; do \
-	  rm -f $(includedir)/$$f; \
+	  rm -f $(octincludedir)/$$f; \
 	done
 .PHONY: uninstall