Mercurial > forge
changeset 1720:b4586377f0a6 octave-forge
[for Dan McMahill] use INSTALL_SCRIPT for scripts
| author | pkienzle |
|---|---|
| date | Thu, 09 Sep 2004 11:53:25 +0000 |
| parents | b7c00545efe3 |
| children | edc0e7dceab1 |
| files | Makeconf.base admin/run_forge extra/mex/Makefile octinst.sh.in |
| diffstat | 4 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.base Thu Sep 09 11:48:44 2004 +0000 +++ b/Makeconf.base Thu Sep 09 11:53:25 2004 +0000 @@ -19,6 +19,7 @@ includedir = @includedir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALLOCT=octinst.sh
--- a/admin/run_forge Thu Sep 09 11:48:44 2004 +0000 +++ b/admin/run_forge Thu Sep 09 11:53:25 2004 +0000 @@ -34,6 +34,7 @@ # make sure we can find supporting binaries if test -d "$f/bin"; then EXECPATH="$ROOT/$f/bin:$EXECPATH"; fi + if test -d "$f/scripts"; then EXECPATH="$ROOT/$f/scripts:$EXECPATH"; fi # supporting libraries need to be available as well check=`echo $f/*.dll`
--- a/extra/mex/Makefile Thu Sep 09 11:48:44 2004 +0000 +++ b/extra/mex/Makefile Thu Sep 09 11:53:25 2004 +0000 @@ -58,7 +58,7 @@ @if test -d $(bindir) ; then \ echo installing mex/mex in $(bindir) ; \ $(RM) $(bindir)/mex ; \ - $(INSTALL_PROGRAM) mex $(bindir)/mex ; \ + $(INSTALL_SCRIPT) mex $(bindir)/mex ; \ fi clean: ; $(RM) mex mex_* $(MEXLIB) *.o *.oct core octave-core *~
--- a/octinst.sh.in Thu Sep 09 11:48:44 2004 +0000 +++ b/octinst.sh.in Thu Sep 09 11:53:25 2004 +0000 @@ -23,6 +23,7 @@ INSTALL="@INSTALL@" INSTALL_DATA="@INSTALL_DATA@" INSTALL_PROGRAM="@INSTALL_PROGRAM@" +INSTALL_SCRIPT="@INSTALL_SCRIPT@" MKPKGADD="@TOPDIR@/admin/mkpkgadd" COPY_FLAGS="@COPY_FLAGS@" @@ -88,3 +89,10 @@ $INSTALL_PROGRAM $files $xpath fi +# grab the script files, skipping the CVS directory +files=`echo $source/scripts/* | sed -e "s/[^ ]*CVS//"` +if test "$files" != "$source/scripts/*" ; then + $INSTALL -d $xpath + $INSTALL_SCRIPT $files $xpath +fi +