Skip to content

Commit

Permalink
Merge pull request #923 from iankko/changes_that_should_go_into_0.1.2…
Browse files Browse the repository at this point in the history
…7_rel_yet

Changes that should go into 0.1.27 rel yet
  • Loading branch information
iankko committed Dec 11, 2015
2 parents 7c6aa6e + 8977c37 commit 237686d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
7 changes: 6 additions & 1 deletion Contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Developers:
* Andrew Gilmore
* Jeremiah Jahn
* Luke Kordell
* Jan Lieskovsky
* Ján Lieskovský
* Šimon Lukašík
* Michael McConachie
* Rodney Mercer
Expand All @@ -39,5 +39,10 @@ Developers:
* Paul Tittle
* Jeb Trayer
* Shawn Wells
* Jan Černý
* Zbyněk Moravec
* Michal Šrubař
* Jean-Baptiste Donnette
* Philippe Thierry

Testing:
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ DOCDIR=$(DATADIR)/doc

# Define Makefile targets below

all: validate-buildsystem fedora rhel5 rhel6 rhel7 openstack rhevm3 webmin firefox jre chromium rpm
dist: chromium-dist firefox-dist fedora-dist jre-dist rhel6-dist rhel7-dist
all: validate-buildsystem fedora rhel5 rhel6 rhel7 openstack rhevm3 webmin firefox jre chromium debian8 rpm
dist: chromium-dist firefox-dist fedora-dist jre-dist rhel6-dist rhel7-dist debian8-dist

fedora:
cd Fedora/ && $(MAKE)
Expand Down Expand Up @@ -256,6 +256,7 @@ install: dist
install -m 0644 Firefox/dist/guide/* $(PREFIX)/$(DOCDIR)/scap-security-guide/guides
install -m 0644 JRE/dist/content/* $(PREFIX)/$(DATADIR)/xml/scap/ssg/content/
install -m 0644 JRE/dist/guide/* $(PREFIX)/$(DOCDIR)/scap-security-guide/guides
install -m 0644 Debian/8/dist/content/* $(PREFIX)/$(DATADIR)/xml/scap/ssg/content/
install -m 0644 Debian/8/dist/guide/* $(PREFIX)/$(DOCDIR)/scap-security-guide/guides
install -m 0644 docs/scap-security-guide.8 $(PREFIX)/$(MANDIR)/en/man8/
install -m 0644 LICENSE $(PREFIX)/$(DOCDIR)/scap-security-guide
Expand Down

0 comments on commit 237686d

Please sign in to comment.