--- trunk/installer-simple/Makefile 2014/01/07 14:57:45 2447 +++ trunk/installer-simple/Makefile 2014/01/07 15:00:24 2449 @@ -1,9 +1,5 @@ # $Id$ -VERSION = $(shell cat VERSION) -SYSTEMDUNITDIR = $(shell pkg-config --variable=systemdsystemunitdir systemd) -INSTALLER_TTY = tty1 - SYSCONFDIR = /etc PREFIX = /usr LIBDIR = $(PREFIX)/lib/installer @@ -13,6 +9,12 @@ 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):' \ @@ -32,7 +34,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)