--- trunk/installer-simple/Makefile	2014/01/03 13:44:02	2328
+++ trunk/installer-simple/Makefile	2014/01/03 22:52:43	2347
@@ -1,27 +1,49 @@
 # $Id$
 
-VERSION=$(shell cat VERSION)
+VERSION = $(shell cat VERSION)
+SYSTEMDUNITDIR = $(shell pkg-config --variable=systemdsystemunitdir systemd)
+INSTALLER_TTY = tty1
 
+SYSCONFDIR = etc
 PREFIX = /usr
 LIBDIR = $(PREFIX)/lib/installer
 BINDIR = $(PREFIX)/bin
 
+SED = sed
+INSTALL = install
+LN_S = ln -snf
+RM = rm
+
 all:
-	sed 's:%VERSIONTAG%:$(VERSION):' \
+	$(SED) -e 's:%VERSIONTAG%:$(VERSION):' \
+		-e 'S:%LIBDIR%:$(LIBDIR):g'
 		bin/installer.sh.in \
 		> bin/installer.sh
+	$(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g'  \
+		-e 's:%BINDIR%:$(BINDIR):g'  \
+		systemd/installer.service.in \
+		> systemd/installer.service
 
 create-dirs:
-	install -d -m 0755 $(DESTDIR)/$(LIBDIR)/functions
-	install -d -m 0755 $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SYSCONFDIR)
+	$(INSTALL) -d -m 0755 $(DESTDIR)/$(LIBDIR)/functions
+	$(INSTALL) -d -m 0755 $(DESTDIR)/$(BINDIR)
 
 install-files:
-	install -m 0755 bin/installer.sh $(DESTDIR)$(BINDIR)/installer
-	install -m 0644 functions/findhdd.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 conf/installer.conf $(DESTDIR)$(SYSCONFDIR)
+	$(INSTALL) -m 0755 bin/installer.sh $(DESTDIR)$(BINDIR)/installer
+	$(INSTALL) -m 0644 functions/hwdetection.sh $(DESTDIR)$(LIBDIR)/functions/
+
+install-systemd:
+	$(INSTALL) -d $(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: create-dirs install-files install-systemd
 
 clean:
-	rm -f bin/installer.sh
+	$(RM) -f bin/installer.sh
+	$(RM) -f systemd/installer.service
 
 .PHONY: all install