--- trunk/installer-simple/Makefile	2014/01/08 15:06:32	2508
+++ tags/installer-simple-0_4_90_20140703_1/Makefile	2014/07/03 09:05:04	2658
@@ -15,6 +15,9 @@
 VERSION = $(shell $(CAT) VERSION)
 SYSTEMDUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd)
 INSTALLER_TTY = tty1
+INSTALLER_LIVEROOT = /run/initramfs/live
+INSTALLER_IMAGEROOT = $(INSTALLER_LIVEROOT)/system
+INSTALLER_INSTALLROOT = /mnt/magellan
 LOCALE =
 
 all:
@@ -26,8 +29,15 @@
 	$(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g' \
 		-e 's:%BINDIR%:$(BINDIR):g' \
 		-e 's:%LOCALE%:$(LOCALE):g' \
+		-e 's:%INSTALLER_LIVEROOT%:$(INSTALLER_LIVEROOT):g' \
+		-e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
 		systemd/installer.service.in \
 		> systemd/installer.service
+	$(SED) -e 's:%INSTALLER_LIVEROOT%:$(INSTALLER_LIVEROOT):g' \
+		-e 's:%INSTALLER_INSTALLROOT%:$(INSTALLER_INSTALLROOT):g' \
+		-e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
+		conf/installer.conf.in \
+		> conf/installer.conf
 
 create-dirs:
 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SYSCONFDIR)
@@ -52,8 +62,6 @@
 	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)
 	$(INSTALL) -m 0644 systemd/installer.service $(DESTDIR)/$(SYSTEMDUNITDIR)
 	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)/local-fs.target.wants
-	$(INSTALL) -m 0644 systemd/mnt-cdrom.mount $(DESTDIR)/$(SYSTEMDUNITDIR)
-	$(LN_S) ../mnt-cdrom.mount $(DESTDIR)/$(SYSTEMDUNITDIR)/local-fs.target.wants/mnt-cdrom.mount
 
 install: create-dirs install-files install-systemd install-mo
 
@@ -77,6 +85,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