--- trunk/installer-simple/Makefile	2014/01/04 00:38:12	2351
+++ trunk/installer-simple/Makefile	2014/01/08 13:13:30	2497
@@ -1,10 +1,6 @@
 # $Id$
 
-VERSION = $(shell cat VERSION)
-SYSTEMDUNITDIR = $(shell pkg-config --variable=systemdsystemunitdir systemd)
-INSTALLER_TTY = tty1
-
-SYSCONFDIR = etc
+SYSCONFDIR = /etc
 PREFIX = /usr
 LIBDIR = $(PREFIX)/lib/installer
 BINDIR = $(PREFIX)/bin
@@ -13,14 +9,21 @@
 INSTALL = install
 LN_S = ln -snf
 RM = rm
+CAT = cat
+PKGCONFIG = pkg-config
+
+VERSION = $(shell $(CAT) VERSION)
+SYSTEMDUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd)
+INSTALLER_TTY = tty1
 
 all:
 	$(SED) -e 's:%VERSIONTAG%:$(VERSION):' \
 		-e 's:%LIBDIR%:$(LIBDIR):g' \
+		-e 's:%SYSCONFDIR%:$(SYSCONFDIR):g' \
 		bin/installer.sh.in \
 		> bin/installer.sh
-	$(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g'  \
-		-e 's:%BINDIR%:$(BINDIR):g'  \
+	$(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g' \
+		-e 's:%BINDIR%:$(BINDIR):g' \
 		systemd/installer.service.in \
 		> systemd/installer.service
 
@@ -32,7 +35,16 @@
 install-files:
 	$(INSTALL) -m 0644 conf/installer.conf $(DESTDIR)$(SYSCONFDIR)
 	$(INSTALL) -m 0755 bin/installer.sh $(DESTDIR)$(BINDIR)/installer
+	$(INSTALL) -m 0644 functions/common.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/common-dialogs.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/installer-dialogs.sh $(DESTDIR)$(LIBDIR)/functions/
 	$(INSTALL) -m 0644 functions/hwdetection.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/bootloader.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/grub.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/grub2.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/initrd-tools.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/dracut.sh $(DESTDIR)$(LIBDIR)/functions/
+	$(INSTALL) -m 0644 functions/mkinitrd.sh $(DESTDIR)$(LIBDIR)/functions/
 
 install-systemd:
 	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)
@@ -40,7 +52,7 @@
 	$(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: create-dirs install-files install-systemd install-mo
 
 pot: locale/installer.pot
 	generate-po.sh --create-pot bin/installer.sh.in installer
@@ -48,12 +60,22 @@
 	generate-po.sh --append-pot functions/common-dialogs.sh installer
 	generate-po.sh --append-pot functions/installer-dialogs.sh installer
 	generate-po.sh --append-pot functions/hwdetection.sh installer
+	generate-po.sh --append-pot functions/bootloader.sh installer
+	generate-po.sh --append-pot functions/grub.sh installer
+	generate-po.sh --append-pot functions/grub2.sh installer
+	generate-po.sh --append-pot functions/initrd-tools.sh installer
+	generate-po.sh --append-pot functions/dracut.sh installer
+	generate-po.sh --append-pot functions/mkinitrd.sh installer
+	generate-po.sh --unique-pot bin/installer.sh.in installer
 	generate-po.sh --generate bin/installer.sh.in installer
+
 install-mo: locale/installer.pot
 	DESTDIR=$(DESTDIR) generate-po.sh --compile bin/installer.sh.in installer
 
 clean:
 	$(RM) -f bin/installer.sh
 	$(RM) -f systemd/installer.service
+	$(RM) -f locale/installer.pot.dump
+	$(RM) -f locale/installer.pot.fixed
 
 .PHONY: all install