--- trunk/installer-simple/Makefile 2014/01/08 15:06:32 2508 +++ trunk/installer-simple/Makefile 2014/04/02 11:23:56 2640 @@ -15,6 +15,8 @@ VERSION = $(shell $(CAT) VERSION) SYSTEMDUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd) INSTALLER_TTY = tty1 +INSTALLER_IMAGEROOT = /run/initramfs/live/system +INSTALLER_INSTALLROOT = /mnt/magellan LOCALE = all: @@ -28,6 +30,10 @@ -e 's:%LOCALE%:$(LOCALE):g' \ systemd/installer.service.in \ > systemd/installer.service + $(SED) -e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \ + -e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \ + conf/installer.conf.in \ + > conf/installer.conf create-dirs: $(INSTALL) -d -m 0755 $(DESTDIR)/$(SYSCONFDIR) @@ -77,6 +83,7 @@ clean: $(RM) -f bin/installer.sh + $(RM) -f conf/installer.conf $(RM) -f systemd/installer.service $(RM) -f locale/installer.pot.dump $(RM) -f locale/installer.pot.fixed