Fixed when called from symlinked directory

[edu/xsl.git] / Makefile

diff --git a/Makefile b/Makefile
index 85987c03c33142d64f8160ca501235181ff2a44f..cc75c19f36e88cb277148654646017c1a5e934b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ endif
 export BASEDIR
 
 # RELATIVEDIR: relative path from BASEDIR to the current directory
-RELATIVEDIR=$(patsubst /%,%,$(patsubst $(BASEDIR)%,%,$(shell pwd)))
+RELATIVEDIR=$(patsubst /%,%,$(patsubst $(BASEDIR)%,%,$(shell pwd -L)))
 
 # BACK_TO_BASE: relative path from the current directory to BASEDIR
 BACK_TO_BASE:=$(shell echo $(RELATIVEDIR)|sed -e 's/[^/]\+/../g')
@@ -59,6 +59,9 @@ endif
        $(Q)mkdir -p $(dir $@)
        $(Q)echo "  XSLTPROC $(RELATIVEDIR:%=%/)$(notdir $@)"
        $(Q)xsltproc --stringparam www.root "$(WWW_ROOT)" $(XSLTPROCFLAGS) $(BASEDIR)/xsl/course.xsl $< > "$@"
+ifdef SHOW_HTML_PATH
+       $(Q)echo "$@"           # Used by XXE macro to display the compiled page
+endif
 
 
 links.mk: $(XMLS:%.xml=%.links)