diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2011-06-01 09:18:46 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-06-01 09:18:46 +0200 |
| commit | 7d7f952a0ad378da5a8f384867d1e4b5709e54d5 (patch) | |
| tree | e97f0326956ce6282a91e72df5fcba42f7082b31 /mk | |
| parent | b615a1555ea2f1e751bee5a042d4433245330cf0 (diff) | |
| download | fbida-7d7f952a0ad378da5a8f384867d1e4b5709e54d5.tar.gz | |
makefile update
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/Autoconf.mk | 3 | ||||
| -rw-r--r-- | mk/Compile.mk | 2 | ||||
| -rw-r--r-- | mk/Maintainer.mk | 19 |
3 files changed, 12 insertions, 12 deletions
diff --git a/mk/Autoconf.mk b/mk/Autoconf.mk index 27eeb32..7608ea5 100644 --- a/mk/Autoconf.mk +++ b/mk/Autoconf.mk @@ -85,11 +85,12 @@ ac_lib = $(shell \ # check if some compiler flag works # args: compiler flag ac_cflag = $(shell \ - $(call ac_init,if $(CC) supports $(1));\ + $(call ac_init,for $(CC) cflags);\ echo 'int main() {return 0;}' > __actest.c;\ $(call ac_b_cmd,$(CC) $(CFLAGS) $(1) $(LDFLAGS) -o \ __actest __actest.c);\ rm -f __actest __actest.c;\ + if test "$${rc}" = "yes"; then rc="$(1)"; else rc="$(2)"; fi;\ $(call ac_fini)) # check for some binary diff --git a/mk/Compile.mk b/mk/Compile.mk index 4ab59f4..ae88f14 100644 --- a/mk/Compile.mk +++ b/mk/Compile.mk @@ -45,7 +45,7 @@ ifeq ($(verbose),no) echo_msgfmt_po = echo " MSGFMT " $@ else echo_compile_c = echo $(compile_c) - echo_compile_c = echo $(compile_c_pic) + echo_compile_c_pic = echo $(compile_c_pic) echo_compile_cc = echo $(compile_cc) echo_link_app = echo $(link_app) echo_link_so = echo $(link_so) diff --git a/mk/Maintainer.mk b/mk/Maintainer.mk index 23446ae..fedc5cc 100644 --- a/mk/Maintainer.mk +++ b/mk/Maintainer.mk @@ -12,17 +12,16 @@ sync:: distclean chmod 444 $(srcdir)/INSTALL $(srcdir)/mk/*.mk -repository = $(shell cat CVS/Repository) +repository := $(shell basename $(PWD)) release-dir ?= $(HOME)/projects/Releases -release-pub ?= goldbach@me.in-berlin.de:dl.bytesex.org/releases/$(repository) -tarball = $(release-dir)/$(repository)-$(VERSION).tar.gz +release-pub ?= bigendian.kraxel.org:/public/vhosts/www.kraxel.org/releases/$(repository) +tarball = $(release-dir)/$(repository)-$(VERSION).tar .PHONY: release release: - cvs tag $(RELTAG) - cvs export -r $(RELTAG) -d "$(repository)-$(VERSION)" "$(repository)" - find "$(repository)-$(VERSION)" -name .cvsignore -exec rm -fv "{}" ";" - tar -c -z -f "$(tarball)" "$(repository)-$(VERSION)" - rm -rf "$(repository)-$(VERSION)" - scp $(tarball) $(release-pub) - + git tag -m "release $(VERSION)" "$(VERSION)" + git push --tags + git archive --format=tar --prefix=$(repository)-$(VERSION)/ \ + -o $(tarball) $(VERSION) + gzip $(tarball) + scp $(tarball).gz $(release-pub) |