--- trunk/installer-simple/Makefile	2014/01/03 13:51:48	2331
+++ trunk/installer-simple/Makefile	2014/01/03 14:07:34	2335
@@ -4,6 +4,7 @@
 SYSTEMDUNITDIR = $(shell pkg-config --variable=systemdsystemunitdir systemd)
 INSTALLER_TTY = tty1
 
+SYSCONFDIR = etc
 PREFIX = /usr
 LIBDIR = $(PREFIX)/lib/installer
 BINDIR = $(PREFIX)/bin
@@ -14,7 +15,8 @@
 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'  \
@@ -23,12 +25,14 @@
 		> systemd/installer.service
 
 create-dirs:
+	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SYSCONFDIR)
 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(LIBDIR)/functions
 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(BINDIR)
 
 install-files:
+	$(INSTALL) -m 0644 conf/installer.conf $(DESTDIR)$(SYSCONFDIR)
 	$(INSTALL) -m 0755 bin/installer.sh $(DESTDIR)$(BINDIR)/installer
-	$(INSTALL) -m 0644 functions/findhdd.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/hwdetection.sh $(DESTDIR)$(LIBDIR)/functions/
 
 install-systemd
 	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)