@@ -16,11 +16,11 @@ CONFIGURE := configure
16#-------------------------------------------------------------------------------
16#-------------------------------------------------------------------------------
17# Cabal constants
17# Cabal constants
18#-------------------------------------------------------------------------------
18#-------------------------------------------------------------------------------
19−NAME := $(shell sed -ne 's/^[Nn]ame:[[:space:]]*//p' $(CABAL).in)
19+NAME := $(shell sed -ne 's/^[Nn]ame:[[:space:]]*//p' $(CABAL))
20THIS := $(shell echo $(NAME) | tr A-Z a-z)
20THIS := $(shell echo $(NAME) | tr A-Z a-z)
21VERSION := $(shell sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' $(SRCDIR)/Main.hs)
21VERSION := $(shell sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' $(SRCDIR)/Main.hs)
22RELNAME := $(THIS)-$(VERSION)
22RELNAME := $(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))
25#-------------------------------------------------------------------------------
25#-------------------------------------------------------------------------------
26# Install targets
26# Install targets
@@ -31,7 +31,6 @@ EXTENSION := $(shell uname | tr '[:upper:]' '[:lower:]' | \
31 sed -ne 's/^cygwin.*$$/\.exe/p')
31 sed -ne 's/^cygwin.*$$/\.exe/p')
32EXECS := $(addsuffix $(EXTENSION),$(EXECSBASE))
32EXECS := $(addsuffix $(EXTENSION),$(EXECSBASE))
33PROGS := $(EXECS) $(WRAPPERS)
33PROGS := $(EXECS) $(WRAPPERS)
34−# First entry in Cabal's executable stanza is the main executable.
35MAIN := $(firstword $(EXECS))
34MAIN := $(firstword $(EXECS))
36DOCS := README.html README BUGS
35DOCS := README.html README BUGS
@@ -115,10 +114,6 @@ cleanup_files+=$(WRAPPERS)
115$(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh
114$(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh
116 @$(generate-shell-script)
115 @$(generate-shell-script)
118−cleanup_files+=$(CABAL)
119−$(CABAL): cabalize $(CABAL).in $(SRCDIR)/Main.hs
120− ./cabalize <$(CABAL).in >$(CABAL)
122.PHONY: configure
117.PHONY: configure
123cleanup_files+=$(BUILDDIR) $(BUILDCONF) $(BUILDVARS)
118cleanup_files+=$(BUILDDIR) $(BUILDCONF) $(BUILDVARS)
124configure: $(BUILDCONF) templates
119configure: $(BUILDCONF) templates
@@ -138,10 +133,10 @@ cleanup_files+=$(EXECS)
138$(EXECS): build
133$(EXECS): build
139 for f in $@; do \
134 for f in $@; do \
140 [ -f $$f ] || { \
135 [ -f $$f ] || { \
141− find $(BUILDDIR) -type f -name "$$f" \
136+ find $(BUILDDIR) -type f -name "$$f" \
142− -perm +a=x -exec ln -s {} . \; ; \
137+ -perm +a=x -exec ln -s {} . \; ; \
146.PHONY: build-doc
141.PHONY: build-doc
147cleanup_files+=README.html
142cleanup_files+=README.html
@@ -331,6 +326,8 @@ cleanup_files+=$(tarball_name)
331tarball: $(tarball_name)
326tarball: $(tarball_name)
332$(tarball_name):
327$(tarball_name):
333 svn export . $(RELNAME)
328 svn export . $(RELNAME)
329+ $(MAKE) -C $(RELNAME) templates
330+ $(MAKE) -C $(RELNAME) wrappers
334 tar cvzf $(tarball_name) $(RELNAME)
331 tar cvzf $(tarball_name) $(RELNAME)
335 -rm -rf $(fullname)
332 -rm -rf $(fullname)