From 8a694ba329001d32ca192dc86def96e4a1880aef Mon Sep 17 00:00:00 2001 From: Vladimir Volovich Date: Fri, 30 May 2008 09:14:22 +0000 Subject: change to the Build script in r8412 (which allows the Build to work on systems such as Solaris which don't have BSD-compatible "install" program) made ZZIPLIBSRCDIR an absolute directory, so ../$(ZZIPLIBSRCDIR)/zzip/Makefile won't work. the rules for zziplib are broken, in that they assume that the Work directory is a sub-directory of the source directory, and use specific relative paths, and/or they don't work for absolute directories. now, removing changing ../$(ZZIPLIBSRCDIR)/ to $(ZZIPLIBSRCDIR)/ will rely on $(ZZIPLIBSRCDIR) being an absolute directory. so if someone manually calls configure (rather than via the Build script) he needs to run it with absolute path, e.g. even `pwd`/../configure rather than ../configure git-svn-id: svn://tug.org/texlive/trunk@8417 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/luatexlib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/luatexdir/luatexlib.mk b/Build/source/texk/web2c/luatexdir/luatexlib.mk index 32e14e124cd..d0613144303 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)/* . && \ -- cgit v1.2.3