diff --git a/Makefile b/Makefile index a8625b5..0c28128 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for livecd-tools -# Copyright (c) 2004-2015 by Silvan Calarco +# Copyright (c) 2004-2022 by Silvan Calarco # Released under the terms of the GNU GPLv3 license NAME=livecd-tools @@ -8,7 +8,6 @@ include VERSION # System locations prefix = /usr -kdeprefix = /opt/kde3 exec_prefix = ${prefix} sysconfdir = /etc sbindir = /sbin @@ -16,11 +15,9 @@ bindir = ${exec_prefix}/bin libdir = ${prefix}/lib mandir = ${prefix}/usr/share/man datadir = ${prefix}/share -kdedatadir = ${kdeprefix}/share iconsdir = ${datadir}/icons/hicolor -initrddir = ${sysconfdir}/rc.d/init.d sysconfigdir= ${sysconfdir}/sysconfig -localesdir = ${kdedatadir}/locale +localesdir = ${datadir}/locale srcdir = . DESTDIR = @@ -29,9 +26,7 @@ INSTALL_PROGRAM = ${INSTALL} -m 755 INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DIR = ${INSTALL} -d -m 755 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -KDEMENU_DIR = ${kdedatadir}/applnk SYSTEM_MENU_DIR = ${datadir}/applications -WALLPAPERS_DIR = ${kdedatadir}/wallpapers STATIC_DIR = /static # package related variables @@ -57,7 +52,6 @@ install-locales: locales done install-dirs: - @$(INSTALL_DIR) $(DESTDIR)$(WALLPAPERS_DIR) @$(INSTALL_DIR) $(DESTDIR)$(sbindir) @$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir) @$(INSTALL_DIR) $(DESTDIR)$(SYSTEM_MENU_DIR) @@ -66,13 +60,7 @@ install-dirs: @$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/systemd/system/ @$(INSTALL_DIR) $(DESTDIR)$(libdir)/calamares/modules/ -install-icons: - @for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \ - $(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \ - $(INSTALL_DATA) installer-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/installer.png; \ - done - -install: install-dirs install-locales install-icons +install: install-dirs install-locales $(INSTALL_DATA) tools/autovt@.service $(DESTDIR)$(sysconfdir)/systemd/system/ $(INSTALL_DATA) tools/eject.service $(DESTDIR)$(sysconfdir)/systemd/system/ $(INSTALL_PROGRAM) liveuser-sudoers $(DESTDIR)$(sysconfdir)/sudoers.d/liveuser @@ -84,7 +72,6 @@ install: install-dirs install-locales install-icons clean: dist: clean - @git log > ChangeLog.git @mkdir /tmp/$(distdir) @cp -a * /tmp/$(distdir)/ @rm -f $(dist_archive);\ diff --git a/installer-128x128.png b/installer-128x128.png deleted file mode 100644 index 77a48d6..0000000 Binary files a/installer-128x128.png and /dev/null differ diff --git a/installer-16x16.png b/installer-16x16.png deleted file mode 100644 index 2dcfc01..0000000 Binary files a/installer-16x16.png and /dev/null differ diff --git a/installer-22x22.png b/installer-22x22.png deleted file mode 100644 index 6c4703f..0000000 Binary files a/installer-22x22.png and /dev/null differ diff --git a/installer-32x32.png b/installer-32x32.png deleted file mode 100644 index c84cc2f..0000000 Binary files a/installer-32x32.png and /dev/null differ diff --git a/installer-48x48.png b/installer-48x48.png deleted file mode 100644 index b0770ec..0000000 Binary files a/installer-48x48.png and /dev/null differ diff --git a/installer-64x64.png b/installer-64x64.png deleted file mode 100644 index 3455b92..0000000 Binary files a/installer-64x64.png and /dev/null differ diff --git a/installer.svg b/installer.svg deleted file mode 100644 index 571643d..0000000 --- a/installer.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -