diff options
| author | Vladimir Volovich <vvv@vsu.ru> | 2008-05-31 23:09:36 +0000 |
|---|---|---|
| committer | Vladimir Volovich <vvv@vsu.ru> | 2008-05-31 23:09:36 +0000 |
| commit | 6f6a806fcf006711f68dd4af1eecb5f3524ef36d (patch) | |
| tree | 06f542d9e276a3cce9e77c3ca2ba85837d45ade0 | |
| parent | 4e4ad43f52948b1ff98893abb43d2b0cc9703842 (diff) | |
revert the last change, as it requires using absolute path to configure.
git-svn-id: svn://tug.org/texlive/trunk@8438 c570f23f-e606-0410-a88d-b1316a301751
| -rwxr-xr-x | Build/source/Build | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/luatexlib.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/Build b/Build/source/Build index f1dad2bac33..ad973538c1c 100755 --- a/Build/source/Build +++ b/Build/source/Build @@ -15,14 +15,14 @@ LANG=C # cd to our source directory. mydir=`dirname $0` cd $mydir || exit 1 -mydir=`pwd` : ${TL_WORKDIR=Work} # allow override of install destination. if test -z "$TL_INSTALL_DEST"; then + H=`pwd` test -d inst || mkdir -p inst/texmf # avoid configure warnings - TL_INSTALL_DEST=$mydir/inst + TL_INSTALL_DEST=$H/inst fi # allow override of make program. @@ -46,7 +46,7 @@ test -d $TL_WORKDIR || mkdir $TL_WORKDIR cd $TL_WORKDIR || exit 1 # allow override of configure location, just in case. -: ${TL_CONFIGURE=$mydir/configure} +: ${TL_CONFIGURE=../configure} # allow override of xdvi toolkit, default to standard xaw. : ${TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw} diff --git a/Build/source/texk/web2c/luatexdir/luatexlib.mk b/Build/source/texk/web2c/luatexdir/luatexlib.mk index d0613144303..32e14e124cd 100644 --- a/Build/source/texk/web2c/luatexdir/luatexlib.mk +++ b/Build/source/texk/web2c/luatexdir/luatexlib.mk @@ -78,14 +78,14 @@ ZZIPLIBDEP = $(ZZIPLIBDIR)/zzip/libzzip.a $(ZZIPLIBDEP): $(ZZIPLIBSRCDIR) mkdir -p $(ZZIPLIBDIR)/zzip && cd $(ZZIPLIBDIR)/zzip && \ - cp $(ZZIPLIBSRCDIR)/zzip/Makefile . && $(MAKE) $(common_makeargs) + cp ../$(ZZIPLIBSRCDIR)/zzip/Makefile . && $(MAKE) $(common_makeargs) # luazip LUAZIPDIR=../../libs/luazip LUAZIPSRCDIR=$(srcdir)/$(LUAZIPDIR) LUAZIPDEP=$(LUAZIPDIR)/src/luazip.o -LUAZIPINC=-I../../lua51 -I$(ZZIPLIBSRCDIR) -I../$(ZZIPLIBDIR) +LUAZIPINC=-I../../lua51 -I../$(ZZIPLIBSRCDIR) -I../$(ZZIPLIBDIR) $(LUAZIPDEP): $(LUAZIPDIR)/src/luazip.c mkdir -p $(LUAZIPDIR) && cd $(LUAZIPDIR) && cp -R $(LUAZIPSRCDIR)/* . && \ |