Hi,
A fix for $mknetrel_root, for the case where mknetrel is invoked with
a relative path, ie:
./bin/mknetrel
And, what I take to be a typo fix (otherwise, $instlibdir should be
initialized somewhere).
Jan.
2002-07-10 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* bin/mknetrel (setvars): Move initialization of mknetrel_root up
(ie: before we cd-away from the directory $0 was invoked from).
(dorebuild): Typo fix: at addmakeflags, use --libdir=$inst$libdir
(previously: $instlibdir).
* .cvsignore: Add CVS, *~.
? ChangeLog.jcn
Index: .cvsignore
===================================================================
RCS file: /cvs/cygwin-apps/mknetrel/.cvsignore,v
retrieving revision 1.3
diff -p -u -r1.3 .cvsignore
--- .cvsignore 10 Jul 2002 02:21:27 -0000 1.3
+++ .cvsignore 10 Jul 2002 13:03:22 -0000
@@ -1,4 +1,6 @@
+CVS
Makefile
+*~
.*~
.#*
#*
Index: bin/mknetrel
===================================================================
RCS file: /cvs/cygwin-apps/mknetrel/bin/mknetrel,v
retrieving revision 1.35
diff -p -u -r1.35 mknetrel
--- bin/mknetrel 10 Jul 2002 02:57:14 -0000 1.35
+++ bin/mknetrel 10 Jul 2002 13:03:22 -0000
@@ -51,6 +51,8 @@ drop ()
}
setvars() {
+ mknetrel_root=$(cd $(dirname $0)/..;pwd)
+
cd $netrel_root || exit 1
here=`pwd`
cd src
@@ -59,7 +61,6 @@ setvars() {
done
cd ..
- mknetrel_root=$(cd $(dirname $0)/..;pwd)
package_name="$package"
package_src="$package"
base=`expr "$package" : '\([^-]*\)-.*$'`
@@ -218,7 +219,7 @@ dorebuild() {
addmakeflags '"TARGET_FLAGS_TO_PASS=$EXTRAINSTALLARGS"' "' "
'$(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)' "'"
addmakeflags '"FLAGS_TO_PASS=$EXTRAINSTALLARGS"' "' " '$(BASE_FLAGS_TO_PASS)
$(EXTRA_HOST_FLAGS)' "'"
fi
- addmakeflags 'AM_MAKEFLAGS="prefix=$inst$prefix exec_prefix=$inst$exec_prefix
bindir=$inst$bindir libdir=$instlibdir tcl_libdir=$inst$libdir
sysconfdir=$inst$sysconfdir includedir=$inst$prefix/include tooldir=$inst/$prefix
gcc_tooldir=$inst/$prefix libexecdir=$inst$libexecdir $EXTRAINSTALLARGS"'
+ addmakeflags 'AM_MAKEFLAGS="prefix=$inst$prefix exec_prefix=$inst$exec_prefix
+bindir=$inst$bindir libdir=$inst$libdir tcl_libdir=$inst$libdir
+sysconfdir=$inst$sysconfdir includedir=$inst$prefix/include tooldir=$inst/$prefix
+gcc_tooldir=$inst/$prefix libexecdir=$inst$libexecdir $EXTRAINSTALLARGS"'
addmakeflags 'prefix=$inst$prefix exec_prefix=$inst$exec_prefix
bindir=$inst$bindir libdir=$inst$libdir tcl_libdir=$inst$libdir
sysconfdir=$inst$sysconfdir includedir=$inst$prefix/include tooldir=$inst$prefix
gcc_tooldir=$inst$prefix libexecdir=$inst$libexecdir'
eval "make $makeflags install" || exit 1
needinstall_info && gcc_tooldir=$inst$prefix make -i prefix=$inst$prefix
exec_prefix=$inst$exec_prefix bindir=$inst$bindir libdir=$inst$libdir
tcl_libdir=$inst$libdir sysconfdir=$inst$sysconfdir includedir=$inst$prefix/include
tooldir=$inst$prefix gcc_tooldir=$inst$prefix libexecdir=$inst$libexecdir \
--
Jan Nieuwenhuizen <[EMAIL PROTECTED]> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien | http://www.lilypond.org
