diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-22 11:51:38 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-22 11:51:38 +0000 |
| commit | 8821237240c5374d83298b2da5ad88fa1e3c1ef7 (patch) | |
| tree | e1bc03fa83c61165f48ffe3f528ac5496332872a /Makefile.private | |
| parent | 38dcca25c8855c95649e3f0b5b09fae862ed5c7a (diff) | |
| parent | 7307d60063ee4303da4de45f9d984fdc8df92146 (diff) | |
| download | syslinux-8821237240c5374d83298b2da5ad88fa1e3c1ef7.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/master' into baserock/morph
Diffstat (limited to 'Makefile.private')
| -rw-r--r-- | Makefile.private | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.private b/Makefile.private index c70c204d..92127e98 100644 --- a/Makefile.private +++ b/Makefile.private @@ -18,7 +18,7 @@ .PHONY: official release # These files are removed when tarballs are generated. -PRIVATE = Makefile.private MCONFIG.devel +PRIVATE = Makefile.private mk/devel.mk GIT_DIR ?= .git ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' 2>/dev/null && pwd) @@ -38,6 +38,7 @@ burn: isolinux.iso official: $(MAKE) spotless CC='$(CC) -m32' $(MAKE) all CC='$(CC) -m32' + $(MAKE) strip CC='$(CC) -m32' $(MAKE) dist CC='$(CC) -m32' release: @@ -99,7 +100,3 @@ LATEST_PREREL := syslinux-$(VERSION)-pre$(LATEST_PRERELNO) unprerel: echo $(LATEST_PRERELNO) > $(PRERELDIR)/.prerel @echo Next release will be $(LATEST_PREREL) - -preupload: - scp $(PRERELDIR)/$(LATEST_PREREL).* $(UPLOAD)/Testing - git push --tags |