aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2010-03-26 20:55:06 +0000
committerastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2010-03-26 20:55:06 +0000
commit73e9d3404b22e6345d22a665eacdecef291138b9 (patch)
tree1d020f4d5504d6c482be81a457991a39f2e4d253
parentdf5bd725c29a3d7569d6336184db0b9eafde2c33 (diff)
downloadsos-73e9d3404b22e6345d22a665eacdecef291138b9.tar.gz
topping off build
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@881 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rw-r--r--Makefile10
-rw-r--r--sos.spec2
2 files changed, 2 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 332c6815..c7fa9abe 100644
--- a/Makefile
+++ b/Makefile
@@ -16,28 +16,20 @@ all: subdirs
subdirs:
for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done
-install: document
+install:
mkdir -p $(DESTDIR)/usr/sbin
mkdir -p $(DESTDIR)/usr/share/man/man1
mkdir -p $(DESTDIR)/usr/share/$(NAME)/extras
@gzip -c man/en/sosreport.1 > sosreport.1.gz
- mkdir -p $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_sources
- mkdir -p $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_static
mkdir -p $(DESTDIR)/etc
install -m755 sosreport $(DESTDIR)/usr/sbin/sosreport
install -m755 extras/rh-upload $(DESTDIR)/usr/share/$(NAME)/extras/rh-upload
install -m644 sosreport.1.gz $(DESTDIR)/usr/share/man/man1/.
install -m644 LICENSE README README.rh-upload TODO $(DESTDIR)/usr/share/$(NAME)/.
- install -m644 doc/_build/html/*.{html,inv,js} $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/.
- install -m644 doc/_build/html/_sources/* $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_sources/.
- install -m644 doc/_build/html/_static/* $(DESTDIR)/usr/share/doc/$(NAME)-$(VERSION)/_static/.
install -m644 $(NAME).conf $(DESTDIR)/etc/$(NAME).conf
install -m644 gpgkeys/rhsupport.pub $(DESTDIR)/usr/share/$(NAME)/.
for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
-document:
- make -C $(PWD)/doc html
-
archive: gpgkey
@rm -rf $(NAME)-$(VERSION).tar.gz
@rm -rf $(TMPDIR)
diff --git a/sos.spec b/sos.spec
index 84da9e43..2efd337a 100644
--- a/sos.spec
+++ b/sos.spec
@@ -3,7 +3,7 @@
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
Version: 1.9
-Release: 2%{?dist}.3
+Release: 2%{?dist}.4
Group: Applications/System
Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
License: GPLv2+