Mercurial > hg > octave-image

changeset 190:2f1631a0a368

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Latest package manager mega patch, but not the last
author adb014
date Fri, 25 Aug 2006 19:49:46 +0000
parents fe024c600307
children 99a4febc0947
files src/Makefile src/autogen.sh src/configure.base src/install-sh src/octinst.sh.in
diffstat 5 files changed, 4 insertions(+), 351 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,7 +9,7 @@
 endif
 
 ifdef HAVE_MAGICKXX
-	IMAGEMAGICK=__imagemagick__.oct __magick_read__$(OCTLINK)
+	IMAGEMAGICK=__imagemagick__.oct
 endif
 
 all: cordflt2.oct bwlabel.oct bwfill.oct rotate_scale.oct \
@@ -31,7 +31,4 @@
 __imagemagick__.oct: __imagemagick__.cc
 	$(MKOCTFILE) $< -lMagick++ -lMagick
 
-__magick_read__$(OCTLINK): __imagemagick__.oct
-	$(MKOCTLINK) __imagemagick__.oct $@
-
 clean: ; -$(RM) *.o octave-core core *.oct *~
--- a/src/autogen.sh
+++ b/src/autogen.sh
@@ -7,7 +7,7 @@
 cat <<EOF >> configure.in
   AC_OUTPUT(\$CONFIGURE_OUTPUTS)
   dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions
-  chmod 0771 octinst.sh
+
   echo " "
   echo "  \"\\\$prefix\" is \$prefix"
   echo "  \"\\\$exec_prefix\" is \$exec_prefix"
--- a/src/configure.base
+++ b/src/configure.base
@@ -296,7 +296,7 @@
 OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT)
 
 AC_PROG_LN_S
-AC_PROG_INSTALL
+
 AC_PROG_RANLIB
 
 dnl Use $(COPY_FLAGS) to set options for cp when installing .oct files.
@@ -366,7 +366,7 @@
 fi
 
 
-CONFIGURE_OUTPUTS="Makeconf octinst.sh"
+CONFIGURE_OUTPUTS="Makeconf"
 STATUS_MSG="
 octave commands will install into the following directories:
    m-files:   $mpath
deleted file mode 100755
--- a/src/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
deleted file mode 100755
--- a/src/octinst.sh.in
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-# octinst.sh source mpath opath xpath [altmpath altopath]
-
-# Copies all m-files and oct-files from the source directory to the
-# mpath and opath respectively.  Preserves links.  Files in
-# source/data are copied to mpath.  Files in the source/bin are copied
-# to xpath. m-files and oct-files in source/alternatives are copied to 
-# altmpath and altopath respectively
-
-if test $# -lt 4 ; then
-    echo 'Not enough arguments'
-    exit 1
-fi
-
-# interpret input parameters
-source=$1; shift
-mpath=$1; shift
-opath=$1; shift
-xpath=$1; shift
-if test $# -ge 1; then altmpath=$1; shift; fi
-if test $# -ge 1; then altopath=$1; shift; fi
-INSTALL="@INSTALL@"
-INSTALL_DATA="@INSTALL_DATA@"
-INSTALL_PROGRAM="@INSTALL_PROGRAM@"
-INSTALL_SCRIPT="@INSTALL_SCRIPT@"
-MKPKGADD="@TOPDIR@/admin/mkpkgadd"
-COPY_FLAGS="@COPY_FLAGS@"
-
-# grab the m-files
-files=`echo $source/*.m`
-if test "$files" != "$source/*.m" ; then
-    $INSTALL -d $mpath
-    $INSTALL_DATA $files $mpath
-fi
-
-# grab the oct-files
-files=`echo $source/*.oct`
-if test "$files" != "$source/*.oct" ; then
-    $INSTALL -d $opath
-## Grrr... install doesn't preserve links.  Hope this works.
-    cp $COPY_FLAGS $files $opath
-fi
-
-# install alternatives
-if test -d "$source/alternatives" ; then
-    # m-files
-    files=`echo $source/alternatives/*.m`
-    if test "$files" != "$source/alternatives/*.m" ; then
-        $INSTALL -d $altmpath
-	$INSTALL_DATA $files $altmpath
-    fi
-    # oct-files
-    files=`echo $source/alternatives/*.oct`
-    if test "$files" != "$source/alternatives/*.oct" ; then
-        $INSTALL -d $altopath
-	$INSTALL_DATA $files $altopath
-    fi
-fi
-
-# Create PKG_ADD, and destroy it immediately if it is empty
-# XXX FIXME XXX no PKG_ADD created if only oct-files and no m-files.
-if test -d "$mpath" ; then
-    $MKPKGADD $source > $mpath/PKG_ADD
-    if test -z "`cat $mpath/PKG_ADD`" ; then rm -f $mpath/PKG_ADD;  fi
-fi
-# PKG_ADD for alternatives
-if test -d "$source/alternatives" -a -d "$altmpath" ; then
-    $MKPKGADD $source/alternatives > $altmpath/PKG_ADD
-    if test -z "`cat $altmpath/PKG_ADD`" ; then rm $altmpath/PKG_ADD; fi
-fi
-
-# grab the data files, skipping the CVS directory
-files=`echo $source/data/* | sed -e "s/[^ ]*CVS//"`
-if test -n "$files" -a "$files" != "$source/data/*" ; then
-    $INSTALL -d $mpath
-    $INSTALL_DATA $files $mpath
-fi
-
-# grab the executable files, skipping the CVS directory
-files=`echo $source/bin/* | sed -e "s/[^ ]*CVS//"`
-if test -n "$files" -a "$files" != "$source/bin/*" ; then
-    $INSTALL -d $xpath
-    $INSTALL_PROGRAM $files $xpath
-fi
-
-# grab the script files, skipping the CVS directory
-files=`echo $source/scripts/* | sed -e "s/[^ ]*CVS//"`
-if test -n "$files" -a "$files" != "$source/scripts/*" ; then
-    $INSTALL -d $xpath
-    $INSTALL_SCRIPT $files $xpath
-fi
-