diff --git a/Makefile.in b/Makefile.in index 91e132088..10b057997 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,7 +48,7 @@ distclean: clean done rm -fr Makefile autom4te.cache config.log config.status config.h -install: all +realinstall: # firejail executable mkdir -p $(DESTDIR)/$(PREFIX)/bin install -c -m 0755 src/firejail/firejail $(DESTDIR)/$(PREFIX)/bin/. @@ -122,83 +122,16 @@ install: all install -c -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/firejail install -c -m 0644 src/bash_completion/firemon.bash_completion $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/firemon + +install: all + $(MAKE) realinstall + install-strip: all - # firejail executable strip src/firejail/firejail - mkdir -p $(DESTDIR)/$(PREFIX)/bin - install -c -m 0755 src/firejail/firejail $(DESTDIR)/$(PREFIX)/bin/. - chmod u+s $(DESTDIR)/$(PREFIX)/bin/firejail - # firemon executable strip src/firemon/firemon - install -c -m 0755 src/firemon/firemon $(DESTDIR)/$(PREFIX)/bin/. - # libraries and plugins strip src/libtrace/libtrace.so - mkdir -p $(DESTDIR)/$(PREFIX)/lib/firejail - install -c -m 0644 src/libtrace/libtrace.so $(DESTDIR)/$(PREFIX)/lib/firejail/. strip src/ftee/ftee - install -c -m 0755 src/ftee/ftee $(DESTDIR)/$(PREFIX)/lib/firejail/. - install -c -m 0755 src/fshaper/fshaper.sh $(DESTDIR)/$(PREFIX)/lib/firejail/. - # documents - mkdir -p $(DESTDIR)/$(DOCDIR) - install -c -m 0644 COPYING $(DESTDIR)/$(DOCDIR)/. - install -c -m 0644 README $(DESTDIR)/$(DOCDIR)/. - install -c -m 0644 RELNOTES $(DESTDIR)/$(DOCDIR)/. - # etc files - mkdir -p $(DESTDIR)/etc/firejail - install -c -m 0644 etc/audacious.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/clementine.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/gnome-mplayer.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/rhythmbox.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/totem.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/firefox.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/icedove.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/iceweasel.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/midori.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/evince.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/chromium-browser.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/chromium.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/disable-mgmt.inc $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/disable-secret.inc $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/disable-common.inc $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/disable-history.inc $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/dropbox.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/opera.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/thunderbird.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/transmission-gtk.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/transmission-qt.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/vlc.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/deluge.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/qbittorrent.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/generic.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/pidgin.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/xchat.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/empathy.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/server.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/icecat.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/quassel.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/deadbeef.profile $(DESTDIR)/etc/firejail/. - install -c -m 0644 etc/filezilla.profile $(DESTDIR)/etc/firejail/. - bash -c "if [ ! -f /etc/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/etc/firejail/.; fi;" - # man pages - rm -f firejail.1.gz - gzip -9n firejail.1 - rm -f firemon.1.gz - gzip -9n firemon.1 - rm -f firejail-profile.5.gz - gzip -9n firejail-profile.5 - rm -f firejail-login.5.gz - gzip -9n firejail-login.5 - mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man1 - install -c -m 0644 firejail.1.gz $(DESTDIR)/$(PREFIX)/share/man/man1/. - install -c -m 0644 firemon.1.gz $(DESTDIR)/$(PREFIX)/share/man/man1/. - mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man5 - install -c -m 0644 firejail-profile.5.gz $(DESTDIR)/$(PREFIX)/share/man/man5/. - install -c -m 0644 firejail-login.5.gz $(DESTDIR)/$(PREFIX)/share/man/man5/. - rm -f firejail.1.gz firemon.1.gz firejail-profile.5.gz firejail-login.5.gz - # bash completion - mkdir -p $(DESTDIR)/$(PREFIX)/share/bash-completion/completions - install -c -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/firejail - install -c -m 0644 src/bash_completion/firemon.bash_completion $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/firemon + $(MAKE) realinstall uninstall: rm -f $(DESTDIR)/$(PREFIX)/bin/firejail diff --git a/README b/README index f8f73ff1a..b40b937cf 100644 --- a/README +++ b/README @@ -44,6 +44,8 @@ mjudtmann (https://github.com/mjudtmann) - lock firejail configuration in disable-mgmt.inc iiotx (https://github.com/iiotx) - use generci.profile by default +pstn (https://github.com/pstn) + - added install-strip, make install without strip Alexey Kuznetsov (kuznet@ms2.inr.ac.ru) - src/lib/libnetlink.c extracted from iproute2 software package diff --git a/RELNOTES b/RELNOTES index 169f02401..a83d7957c 100644 --- a/RELNOTES +++ b/RELNOTES @@ -14,6 +14,7 @@ firejail (0.9.30-rc1) baseline; urgency=low * added build --enable-fatal-warnings configure option * added persistence to --overlay option * added --overlay-tmpfs option + * make install renamed make install-strip * bugfixes -- netblue30 Wed, 9 Sept 2015 08:00:00 -0500 diff --git a/mkdeb.sh b/mkdeb.sh index 2a34b2699..f9eb20ad9 100755 --- a/mkdeb.sh +++ b/mkdeb.sh @@ -20,7 +20,7 @@ tar -xjvf $CODE_ARCHIVE mkdir -p $INSTALL_DIR cd $CODE_DIR ./configure --prefix=$INSTALL_DIR -make && make install +make && make install-strip # second compilation - the path to libtrace.so is hardcoded in firejail executable # pointing according to --prefix=$INSTALL_DIR. We need it to point to /usr/lib