# HG changeset patch # User Jon Tibble # Date 1349859364 -3600 # Node ID e81583782a8ef1c04a1325190ee0480308cbdd69 # Parent 3aac925162663e50159051724d7522de22317166 Fix zsh diff -r 3aac92516266 -r e81583782a8e .hgignore --- a/.hgignore Tue Oct 09 20:07:02 2012 +0100 +++ b/.hgignore Wed Oct 10 09:56:04 2012 +0100 @@ -11,6 +11,7 @@ ^components/tomcat/.*\.tar\.gz$ ^components/tomcat/ecj\.jar$ ^components/zlib/capabilities* +^components/zsh/license$ ^i386/ ^tools/python/pkglint/.*.pyc$ ^tools/time-(amd64|i86).o$ diff -r 3aac92516266 -r e81583782a8e components/zsh/Makefile --- a/components/zsh/Makefile Tue Oct 09 20:07:02 2012 +0100 +++ b/components/zsh/Makefile Wed Oct 10 09:56:04 2012 +0100 @@ -73,18 +73,18 @@ # the language. COMPONENT_BUILD_ENV += LANG=C -source/$(COMPONENT_SRC)/Completion/%: Completion/% +$(SOURCE_DIR)/Completion/%: Completion/% $(CP) $< $@ -$(COMPONENT_SRC)/LICENCE: prep +$(SOURCE_DIR)/LICENCE: prep -license: $(COMPONENT_SRC)/LICENCE +license: $(SOURCE_DIR)/LICENCE iconv -f 8859-1 -t utf-8 $< > $@ CLEAN_PATHS += license # common targets -build: $(BUILD_32) $(COMPOVERRIDES:%=source/$(COMPONENT_SRC)/%) +build: $(BUILD_32) $(COMPOVERRIDES:%=$(SOURCE_DIR)/%) install: build $(INSTALL_32) $(PROTOETCDIR)/zprofile $(PROTOETCDIR)/zshrc license