diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-08-13 16:06:45 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-08-13 23:38:53 -0300 |
commit | 9a45c34fc762b1d52d48ea3886b7b09f0b769c74 (patch) | |
tree | cd9919b93ead1b0ec497cb44073298f456be4003 | |
parent | config.mk.in: move basic variables to the top (diff) | |
download | firejail-9a45c34fc762b1d52d48ea3886b7b09f0b769c74.tar.gz firejail-9a45c34fc762b1d52d48ea3886b7b09f0b769c74.tar.zst firejail-9a45c34fc762b1d52d48ea3886b7b09f0b769c74.zip |
build: rename DOCDIR to docdir
To match other similar variables, such as datarootdir and mandir.
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | config.mk.in | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -124,8 +124,8 @@ ifeq ($(HAVE_CONTRIB_INSTALL),yes) | |||
124 | install -m 0644 contrib/vim/syntax/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax | 124 | install -m 0644 contrib/vim/syntax/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax |
125 | endif | 125 | endif |
126 | # documents | 126 | # documents |
127 | install -m 0755 -d $(DESTDIR)$(DOCDIR) | 127 | install -m 0755 -d $(DESTDIR)$(docdir) |
128 | install -m 0644 -t $(DESTDIR)$(DOCDIR) COPYING README RELNOTES etc/templates/* | 128 | install -m 0644 -t $(DESTDIR)$(docdir) COPYING README RELNOTES etc/templates/* |
129 | # profiles and settings | 129 | # profiles and settings |
130 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail | 130 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail |
131 | install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config | 131 | install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config |
diff --git a/config.mk.in b/config.mk.in index 2f02c42eb..7eed050ca 100644 --- a/config.mk.in +++ b/config.mk.in | |||
@@ -16,10 +16,10 @@ exec_prefix=@exec_prefix@ | |||
16 | bindir=@bindir@ | 16 | bindir=@bindir@ |
17 | libdir=@libdir@ | 17 | libdir=@libdir@ |
18 | datarootdir=@datarootdir@ | 18 | datarootdir=@datarootdir@ |
19 | docdir=@docdir@ | ||
19 | mandir=@mandir@ | 20 | mandir=@mandir@ |
20 | sysconfdir=@sysconfdir@ | 21 | sysconfdir=@sysconfdir@ |
21 | 22 | ||
22 | DOCDIR=@docdir@ | ||
23 | HAVE_APPARMOR=@HAVE_APPARMOR@ | 23 | HAVE_APPARMOR=@HAVE_APPARMOR@ |
24 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ | 24 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ |
25 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ | 25 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ |