diff options
author | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:39:28 -0500 |
---|---|---|
committer | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:39:28 -0500 |
commit | 2ed47031cafe685692a0f076871a5361ef7f63ea (patch) | |
tree | 689de7ee6ca57bced1178a3143ac5549e9b294cf /Makefile.in | |
parent | strip trailing whitespace from test/ (diff) | |
download | firejail-2ed47031cafe685692a0f076871a5361ef7f63ea.tar.gz firejail-2ed47031cafe685692a0f076871a5361ef7f63ea.tar.zst firejail-2ed47031cafe685692a0f076871a5361ef7f63ea.zip |
strip trailing whitespace
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index e9aab83c9..0b2455292 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -122,11 +122,11 @@ endif | |||
122 | done | 122 | done |
123 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" | 123 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" |
124 | rm -fr .etc | 124 | rm -fr .etc |
125 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | 125 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) |
126 | # install apparmor profile | 126 | # install apparmor profile |
127 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" | 127 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" |
128 | install -c -m 0644 etc/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/. | 128 | install -c -m 0644 etc/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/. |
129 | endif | 129 | endif |
130 | # man pages | 130 | # man pages |
131 | install -m 0755 -d $(DESTDIR)/$(mandir)/man1 | 131 | install -m 0755 -d $(DESTDIR)/$(mandir)/man1 |
132 | install -m 0755 -d $(DESTDIR)/$(mandir)/man5 | 132 | install -m 0755 -d $(DESTDIR)/$(mandir)/man5 |
@@ -174,7 +174,7 @@ uninstall: | |||
174 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail | 174 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail |
175 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon | 175 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon |
176 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg | 176 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg |
177 | 177 | ||
178 | DISTFILES = "src etc platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES" | 178 | DISTFILES = "src etc platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES" |
179 | DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils" | 179 | DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils" |
180 | 180 | ||
@@ -211,7 +211,7 @@ rpms: | |||
211 | 211 | ||
212 | extras: all | 212 | extras: all |
213 | $(MAKE) -C extras/firetools | 213 | $(MAKE) -C extras/firetools |
214 | 214 | ||
215 | cppcheck: clean | 215 | cppcheck: clean |
216 | cppcheck --force . | 216 | cppcheck --force . |
217 | 217 | ||
@@ -238,7 +238,7 @@ test-apps-x11-xorg: | |||
238 | 238 | ||
239 | test-sysutils: | 239 | test-sysutils: |
240 | cd test/sysutils; ./sysutils.sh | grep TESTING | 240 | cd test/sysutils; ./sysutils.sh | grep TESTING |
241 | 241 | ||
242 | test-utils: | 242 | test-utils: |
243 | cd test/utils; ./utils.sh | grep TESTING | 243 | cd test/utils; ./utils.sh | grep TESTING |
244 | 244 | ||
@@ -252,13 +252,13 @@ endif | |||
252 | 252 | ||
253 | test-arguments: | 253 | test-arguments: |
254 | cd test/arguments; ./arguments.sh | grep TESTING | 254 | cd test/arguments; ./arguments.sh | grep TESTING |
255 | 255 | ||
256 | test-fs: | 256 | test-fs: |
257 | cd test/fs; ./fs.sh | grep TESTING | 257 | cd test/fs; ./fs.sh | grep TESTING |
258 | 258 | ||
259 | test-fcopy: | 259 | test-fcopy: |
260 | cd test/fcopy; ./fcopy.sh | grep TESTING | 260 | cd test/fcopy; ./fcopy.sh | grep TESTING |
261 | 261 | ||
262 | test: test-profiles test-fcopy test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments | 262 | test: test-profiles test-fcopy test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments |
263 | echo "TEST COMPLETE" | 263 | echo "TEST COMPLETE" |
264 | 264 | ||
@@ -284,11 +284,11 @@ test-network: | |||
284 | # requires the same setup as test-network | 284 | # requires the same setup as test-network |
285 | test-stress: | 285 | test-stress: |
286 | cd test/stress; ./stress.sh | grep TESTING | 286 | cd test/stress; ./stress.sh | grep TESTING |
287 | 287 | ||
288 | # Tesets running a root user | 288 | # Tesets running a root user |
289 | test-root: | 289 | test-root: |
290 | cd test/root; su -c ./root.sh | grep TESTING | 290 | cd test/root; su -c ./root.sh | grep TESTING |
291 | 291 | ||
292 | # OverlayFS is not available on all platforms | 292 | # OverlayFS is not available on all platforms |
293 | test-overlay: | 293 | test-overlay: |
294 | cd test/overlay; ./overlay.sh | grep TESTING | 294 | cd test/overlay; ./overlay.sh | grep TESTING |
@@ -297,4 +297,3 @@ test-overlay: | |||
297 | 297 | ||
298 | test-all: test-root test-chroot test-network test-appimage test-overlay | 298 | test-all: test-root test-chroot test-network test-appimage test-overlay |
299 | echo "TEST COMPLETE" | 299 | echo "TEST COMPLETE" |
300 | |||