remove more samizdat-paths cruft

1 files changed, 9 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index b6ed4b6..6aff815 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ INSTALL_SUBMODULES = fsmgr
 NO_INSTALL_SUBMODULES = cryptonomic-dyndns-server
 SUBMODULES = $(INSTALL_SUBMODULES) $(NO_INSTALL_SUBMODULES)
 
-all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES}
+all: ${compiled_programs} ${SUBMODULES}
 
 .PHONY: stack install-stack
 install-stack:
@@ -37,24 +37,21 @@ wait_for_files: src/wait_for_files.c | build-deps
 %: src/%.c | build-deps
         $(CC) $(CFLAGS)  $< -o $@
 
-src_bin_programs = btrfs-functions.sh var.sh dnsmasq-dhcp-script.sh usb partvi
+src_bin_programs = btrfs-functions.sh var.sh usb partvi
 
-bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils}
+bin_programs=$(addprefix src/, $(src_bin_programs)) ${cc_files} ${btrfs_utils}
 
 btrfs_utils=$(addprefix src/btrfs-utils/, btarfs with-btrfs-seed)
 
-initrd_files:=$(wildcard src/initrd/*) dynmenu samizdat-pinentry wait_for_files
+initrd_files:=$(wildcard src/initrd/*) dynmenu wait_for_files
 initramfs_conf_files:=$(wildcard initramfs-tools/*)
 
 isolinux_files:=$(wildcard isolinux/*)
 
 clean:
-        rm -f samizdat-paths.sh ${compiled_programs}
+        rm -f ${compiled_programs}
 
 .PHONY: all clean
-samizdat-paths.sh: src/samizdat-paths.in
-        @sed -e "s?PREFIX?$(prefix)?g" $< > $@
-include samizdat-paths.sh
 
 install-nested-kvm: conf/kvm.conf
         install -m0644 conf/kvm.conf ${instdir}/etc/modprobe.d/
@@ -149,23 +146,6 @@ boot: rootfs
         sudo update-initramfs -u
         sudo ROOTFS=$(rootfs) ./src/parted-usb.sh
 
-fastboot: rootfs
-        sudo qemu.sh
-
-samizdat.netinst.iso: | $(rootfs)
-        exit 1; sudo initrd.sh
-        sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@
-
-cleantest:
-        make testclean
-        make isotest
-
-isotest: samizdat.iso
-        USE_ISO=y SLOW_BOOT=y NO_NET=y qemu.sh $^
-
-isotest-netinst: samizdat.netinst.iso
-        USE_ISO=y SLOW_BOOT=y qemu.sh $^
-
 samizdat_btrfs_patch_size=256M
 
 get_loop_dev="$$(sudo losetup -n -O name -j $@~tmp)"
@@ -229,23 +209,22 @@ build-submodules-stamp: build-submodules
 install-submodules-stamp: install-submodules
         touch $@
 
+bindir = /usr/local/bin
+
 install-bin-programs: ${bin_programs}
-        install -D -p -t ${instdir}${samizdat_bindir} ${bin_programs}
+        install -D -p -t ${instdir}${bindir} ${bin_programs}
 
 CP=cp --preserve=timestamps -r
 
 defaults_conf_files = conf/grub.default
 initramfs_conf_files = $(addprefix initramfs-tools/,hooks/samizdat scripts/samizdat)
-install-stamp: install-bin-programs samizdat-paths.sh ${compiled_programs}
+install-stamp: install-bin-programs ${compiled_programs}
         install -m644 --backup=t -t /etc/apt/sources.list.d -- conf/bookworm.list
         install -m644 --backup=t -T -- conf/grub.default /etc/default/grub
         install -t /etc/initramfs-tools/hooks   -- initramfs-tools/hooks/samizdat
         install -t /etc/initramfs-tools/scripts -- initramfs-tools/scripts/samizdat
         touch $@
 
-bootclean:
-        rm -f samizdat.disk.img boot-disk.template.img boot-disk.img
-
 .PHONY: update upgrade up upgrade-key initrd
 
 initrd: install