Skip to content

Commit 317ba9f

Browse files
committed
Fix 'make dist'
1 parent 2c10257 commit 317ba9f

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Makefile

+10-7
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ website_files = \
114114
out/doc/ryan-speaker.jpg \
115115
out/doc/yahoo-logo.png
116116

117-
doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
117+
doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
118118

119119
$(apidoc_dirs):
120120
mkdir -p $@
@@ -125,7 +125,7 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
125125
out/doc/%: doc/%
126126
cp $< $@
127127

128-
out/doc/api/%.html: doc/api/%.markdown out/Release/node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
128+
out/doc/api/%.html: doc/api/%.markdown node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
129129
out/Release/node tools/doctool/doctool.js doc/template.html $< > $@
130130

131131
out/doc/%:
@@ -141,23 +141,26 @@ docclean:
141141

142142
VERSION=v$(shell $(PYTHON) tools/getnodeversion.py)
143143
TARNAME=node-$(VERSION)
144+
TARBALL=$(TARNAME).tar.gz
145+
PKG=out/$(TARNAME).pkg
146+
packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
144147

145-
dist: $(TARBALL) $(PKG)
148+
dist: doc $(TARBALL) $(PKG)
146149

147150
PKGDIR=out/dist-osx
148151

149152
pkg: $(PKG)
150153

151154
$(PKG):
152155
-rm -rf $(PKGDIR)
153-
$(WAF) configure --prefix=/usr/local --without-snapshot
154-
DESTDIR=$(PKGDIR) $(WAF) install
156+
./configure --prefix=$(PKGDIR)/usr/local --without-snapshot
157+
$(MAKE) install
155158
$(packagemaker) \
156159
--id "org.nodejs.NodeJS-$(VERSION)" \
157160
--doc tools/osx-pkg.pmdoc \
158161
--out $(PKG)
159162

160-
$(TARBALL): out/doc
163+
$(TARBALL): node out/doc
161164
git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
162165
mkdir -p $(TARNAME)/doc
163166
cp doc/node.1 $(TARNAME)/doc/node.1
@@ -184,4 +187,4 @@ cpplint:
184187

185188
lint: jslint cpplint
186189

187-
.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install install-includes install-bin all program staticlib dynamiclib test test-all website-upload
190+
.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install install-includes install-bin all program staticlib dynamiclib test test-all website-upload pkg

0 commit comments

Comments
 (0)