@@ -16,11 +16,11 @@ CONFIGURE := configure
1616#-------------------------------------------------------------------------------
1717# Cabal constants
1818#-------------------------------------------------------------------------------
19−NAME := $(shell sed -ne 's/^[Nn]ame:[[:space:]]*//p' $(CABAL).in)
19+NAME := $(shell sed -ne 's/^[Nn]ame:[[:space:]]*//p' $(CABAL))
2020THIS := $(shell echo $(NAME) | tr A-Z a-z)
2121VERSION := $(shell sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' $(SRCDIR)/Main.hs)
2222RELNAME := $(THIS)-$(VERSION)
23−EXECSBASE := $(shell sed -ne 's/^[Ee]xecutable:[[:space:]]*//p' $(CABAL).in)
23+EXECSBASE := $(shell sed -ne 's/^[Ee]xecutable:[[:space:]]*//p' $(CABAL))
2424
2525#-------------------------------------------------------------------------------
2626# Install targets
@@ -31,7 +31,6 @@ EXTENSION := $(shell uname | tr '[:upper:]' '[:lower:]' | \
3131 sed -ne 's/^cygwin.*$$/\.exe/p')
3232EXECS := $(addsuffix $(EXTENSION),$(EXECSBASE))
3333PROGS := $(EXECS) $(WRAPPERS)
34−# First entry in Cabal's executable stanza is the main executable.
3534MAIN := $(firstword $(EXECS))
3635DOCS := README.html README BUGS
3736
@@ -115,10 +114,6 @@ cleanup_files+=$(WRAPPERS)
115114$(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh
116115 @$(generate-shell-script)
117116
118−cleanup_files+=$(CABAL)
119−$(CABAL): cabalize $(CABAL).in $(SRCDIR)/Main.hs
120− ./cabalize <$(CABAL).in >$(CABAL)
121−
122117.PHONY: configure
123118cleanup_files+=$(BUILDDIR) $(BUILDCONF) $(BUILDVARS)
124119configure: $(BUILDCONF) templates
@@ -138,10 +133,10 @@ cleanup_files+=$(EXECS)
138133$(EXECS): build
139134 for f in $@; do \
140135 [ -f $$f ] || { \
141− find $(BUILDDIR) -type f -name "$$f" \
142− -perm +a=x -exec ln -s {} . \; ; \
136+ find $(BUILDDIR) -type f -name "$$f" \
137+ -perm +a=x -exec ln -s {} . \; ; \
143138 } \
144− done
139+ done
145140
146141.PHONY: build-doc
147142cleanup_files+=README.html
@@ -331,6 +326,8 @@ cleanup_files+=$(tarball_name)
331326tarball: $(tarball_name)
332327$(tarball_name):
333328 svn export . $(RELNAME)
329+ $(MAKE) -C $(RELNAME) templates
330+ $(MAKE) -C $(RELNAME) wrappers
334331 tar cvzf $(tarball_name) $(RELNAME)
335332 -rm -rf $(fullname)
336333