diff options
| author | Adam Stokes <adam.stokes@canonical.com> | 2012-02-21 10:21:50 +0000 |
|---|---|---|
| committer | Adam Stokes <adam.stokes@canonical.com> | 2012-02-21 10:21:50 +0000 |
| commit | b47e98dd2115b44d2bbd540870129ca33e865e3c (patch) | |
| tree | 21dcd1e7453bc88a66595ff7f0443096e6549562 | |
| parent | 281dd5166661e3c5c03f7d0fe1782798bc1602e6 (diff) | |
| download | sos-b47e98dd2115b44d2bbd540870129ca33e865e3c.tar.gz | |
Makefile: make sure install and as7 block rely on a new
block
This is to make sure that both build options will still
provide a new __init__.py with proper version.
Signed-off-by: Adam Stokes <adam.stokes@canonical.com>
| -rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -33,7 +33,7 @@ ZIP_DEST = $(SRC_BUILD)/$(ARCHIVE_NAME) build: for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done -install: +install: updateversion mkdir -p $(DESTDIR)/usr/sbin mkdir -p $(DESTDIR)/usr/share/man/man1 mkdir -p $(DESTDIR)/usr/share/man/man5 @@ -47,9 +47,11 @@ install: install -m644 LICENSE README TODO $(DESTDIR)/usr/share/$(NAME)/. install -m644 $(NAME).conf $(DESTDIR)/etc/$(NAME).conf install -m644 gpgkeys/rhsupport.pub $(DESTDIR)/usr/share/$(NAME)/. - sed 's/@SOSVERSION@/$(VERSION)/g' sos/__init__.py.in > sos/__init__.py for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done +updateversion: + sed 's/@SOSVERSION@/$(VERSION)/g' sos/__init__.py.in > sos/__init__.py + $(NAME)-$(VERSION).tar.gz: clean gpgkey @mkdir -p $(ARCHIVE_DIR) @tar -cv sosreport sos doc man po sos.conf TODO LICENSE README sos.spec Makefile | tar -x -C $(ARCHIVE_DIR) @@ -85,7 +87,7 @@ po: clean cp $(PO_DIR)/sos_en.properties $(PO_DIR)/sos_en_US.properties cp $(PO_DIR)/sos_en.properties $(PO_DIR)/sos.properties -as7: po +as7: po updateversion cp -r sos/* $(SRC_BUILD)/sos/ find $(SRC_BUILD)/sos/plugins/ -not -name "*as7.py" -not -name "*__init__.py" -type f -delete |