Mercurial > hg > octave-lyh

changeset 3025:5a9dd0a68b1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-06-04 07:29:12 by jwe]
author jwe
date Wed, 04 Jun 1997 07:29:13 +0000
parents 95e8b5c4824a
children 88fa1f27ac1a
files ChangeLog Makeconf.in
diffstat 2 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Wed Jun  4 00:07:29 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Makeconf.in (mk-includedir-link, mk-libdir-link): Make them work.
+
 	* configure.in (OCTAVE_PROGRAM_INVOCATION_NAME): Delete check.
 	* aclocal.m4 (OCTAVE_PROGRAM_INVOCATION_NAME): Delete macro.
 
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -374,14 +374,13 @@
 
 define mk-includedir-link
 src=`echo $(octincludedir) | sed 's|^$(includedir)/*||'` ; \
+echo $$src ; \
 if [ "$$src" = "octave" ] ; then \
   true ; \
 else \
-  if [ -d $(includedir)/octave ] ; then \
-    true ; \
-  else \
-    cd $(includedir) ; rm -f octave && $(LN_S) $$src octave ; \
-  fi ; \
+  cd $(includedir) ; \
+  rm -f octave ; \
+  $(LN_S) $$src octave ; \
 fi
 endef
 
@@ -394,10 +393,8 @@
 if [ "$$src" = "octave" ] ; then \
   true ; \
 else \
-  if [ -d $(libdir)/octave ] ; then \
-    true ; \
-  else \
-    cd $(libdir) ; rm -f octave && $(LN_S) $$src octave ; \
-  fi ; \
+  cd $(libdir) ; \
+  rm -f octave ; \
+  $(LN_S) $$src octave ; \
 fi
 endef