Skip to content

Commit 237686d

Browse files
author
iankko
committed
Merge pull request #923 from iankko/changes_that_should_go_into_0.1.27_rel_yet
Changes that should go into 0.1.27 rel yet
2 parents 7c6aa6e + 8977c37 commit 237686d

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Contributors.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Developers:
1515
* Andrew Gilmore
1616
* Jeremiah Jahn
1717
* Luke Kordell
18-
* Jan Lieskovsky
18+
* Ján Lieskovský
1919
* Šimon Lukašík
2020
* Michael McConachie
2121
* Rodney Mercer
@@ -39,5 +39,10 @@ Developers:
3939
* Paul Tittle
4040
* Jeb Trayer
4141
* Shawn Wells
42+
* Jan Černý
43+
* Zbyněk Moravec
44+
* Michal Šrubař
45+
* Jean-Baptiste Donnette
46+
* Philippe Thierry
4247

4348
Testing:

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ DOCDIR=$(DATADIR)/doc
3636

3737
# Define Makefile targets below
3838

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

4242
fedora:
4343
cd Fedora/ && $(MAKE)
@@ -256,6 +256,7 @@ install: dist
256256
install -m 0644 Firefox/dist/guide/* $(PREFIX)/$(DOCDIR)/scap-security-guide/guides
257257
install -m 0644 JRE/dist/content/* $(PREFIX)/$(DATADIR)/xml/scap/ssg/content/
258258
install -m 0644 JRE/dist/guide/* $(PREFIX)/$(DOCDIR)/scap-security-guide/guides
259+
install -m 0644 Debian/8/dist/content/* $(PREFIX)/$(DATADIR)/xml/scap/ssg/content/
259260
install -m 0644 Debian/8/dist/guide/* $(PREFIX)/$(DOCDIR)/scap-security-guide/guides
260261
install -m 0644 docs/scap-security-guide.8 $(PREFIX)/$(MANDIR)/en/man8/
261262
install -m 0644 LICENSE $(PREFIX)/$(DOCDIR)/scap-security-guide

0 commit comments

Comments
 (0)