Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix 'make dist'

  • Loading branch information...
commit 317ba9fb645029786ec47e719a2c3bcb42b6cfd0 1 parent 2c10257
ry ry authored

Showing 1 changed file with 10 additions and 7 deletions. Show diff stats Hide diff stats

  1. +10 7 Makefile
17 Makefile
@@ -114,7 +114,7 @@ website_files = \
114 114 out/doc/ryan-speaker.jpg \
115 115 out/doc/yahoo-logo.png
116 116
117   -doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
  117 +doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
118 118
119 119 $(apidoc_dirs):
120 120 mkdir -p $@
@@ -125,7 +125,7 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
125 125 out/doc/%: doc/%
126 126 cp $< $@
127 127
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
129 129 out/Release/node tools/doctool/doctool.js doc/template.html $< > $@
130 130
131 131 out/doc/%:
@@ -141,8 +141,11 @@ docclean:
141 141
142 142 VERSION=v$(shell $(PYTHON) tools/getnodeversion.py)
143 143 TARNAME=node-$(VERSION)
  144 +TARBALL=$(TARNAME).tar.gz
  145 +PKG=out/$(TARNAME).pkg
  146 +packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
144 147
145   -dist: $(TARBALL) $(PKG)
  148 +dist: doc $(TARBALL) $(PKG)
146 149
147 150 PKGDIR=out/dist-osx
148 151
@@ -150,14 +153,14 @@ pkg: $(PKG)
150 153
151 154 $(PKG):
152 155 -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
155 158 $(packagemaker) \
156 159 --id "org.nodejs.NodeJS-$(VERSION)" \
157 160 --doc tools/osx-pkg.pmdoc \
158 161 --out $(PKG)
159 162
160   -$(TARBALL): out/doc
  163 +$(TARBALL): node out/doc
161 164 git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
162 165 mkdir -p $(TARNAME)/doc
163 166 cp doc/node.1 $(TARNAME)/doc/node.1
@@ -184,4 +187,4 @@ cpplint:
184 187
185 188 lint: jslint cpplint
186 189
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 comments on commit 317ba9f

Please sign in to comment.
Something went wrong with that request. Please try again.