diff --git a/Makefile b/Makefile index d2e9d5d..4ee760c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # makedist Makefile for installation and packaging -# Copyright (c) 2003-2022 by Silvan Calarco +# Copyright (c) 2003-2024 by Silvan Calarco # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without @@ -15,7 +15,7 @@ dist_archive = $(package)-$(makedist_version).tar.bz2 prefix := /usr datadir := $(prefix)/share sysconfdir := /etc -sbindir := $(prefix)/sbin +bindir := $(prefix)/bin localedir := $(datadir)/locale/ localstatedir := /var makediststatedir := $(localstatedir)/makedist @@ -69,7 +69,7 @@ clean: install: install-locales @install -d $(DESTDIR)$(datadir);\ cp -a makedist $(DESTDIR)$(datadir)/;\ - install -d -m0600 $(DESTDIR)$(sysconfdir)/makedist;\ + install -d $(DESTDIR)$(sysconfdir)/makedist;\ cp -a config/config $(DESTDIR)$(sysconfdir)/makedist/config;\ install -d $(DESTDIR)$(sysconfdir)/sysconfig;\ cp -a config/makedist $(DESTDIR)$(sysconfdir)/sysconfig/makedist;\ @@ -80,7 +80,8 @@ install: install-locales cp -a var/recordvm-xinitrc $(DESTDIR)$(recordvmstatedir)/.xinitrc;\ cp -a var/recordvm-xvidcaprc $(DESTDIR)$(recordvmstatedir)/.xvidcaprc;\ cp -a var/recordvm-xorg.conf $(DESTDIR)$(recordvmstatedir)/xorg.conf;\ - install -d $(DESTDIR)$(sbindir);\ - cp -a bin/makedist-recordvm $(DESTDIR)$(sbindir)/makedist-recordvm - cp -a bin/makedist-newrelease $(DESTDIR)$(sbindir)/makedist-newrelease - cp -a bin/makedist-announcement $(DESTDIR)$(sbindir)/makedist-announcement + install -d $(DESTDIR)$(bindir);\ + cp -a bin/makedist-recordvm $(DESTDIR)$(bindir)/makedist-recordvm + cp -a bin/makedist-newrelease $(DESTDIR)$(bindir)/makedist-newrelease + cp -a bin/makedist-announcement $(DESTDIR)$(bindir)/makedist-announcement + cp -a bin/makedist-docker $(DESTDIR)$(bindir)/makedist-docker