Diff of /trunk/installer-simple/Makefile

Parent Directory | Revision Log | Patch

	revision 2652 by niro, Wed Jul 2 12:40:16 2014 UTC	revision 2653 by niro, Thu Jul 3 08:01:05 2014 UTC
#	Line 15  PKGCONFIG = pkg-config	Line 15  PKGCONFIG = pkg-config
15	VERSION = $(shell $(CAT) VERSION)	VERSION = $(shell $(CAT) VERSION)
16	SYSTEMDUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd)	SYSTEMDUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd)
17	INSTALLER_TTY = tty1	INSTALLER_TTY = tty1
18	INSTALLER_IMAGEROOT = /run/initramfs/live/system	INSTALLER_LIVEROOT = /run/initramfs/live
19		INSTALLER_IMAGEROOT = $(INSTALLER_LIVEROOT)/system
20	INSTALLER_INSTALLROOT = /mnt/magellan	INSTALLER_INSTALLROOT = /mnt/magellan
21	LOCALE =	LOCALE =
22
#	Line 28  all:	Line 29  all:
29	$(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g' \	$(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g' \
30	-e 's:%BINDIR%:$(BINDIR):g' \	-e 's:%BINDIR%:$(BINDIR):g' \
31	-e 's:%LOCALE%:$(LOCALE):g' \	-e 's:%LOCALE%:$(LOCALE):g' \
32		-e 's:%INSTALLER_LIVEROOT%:$(INSTALLER_LIVEROOT):g' \
33	-e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \	-e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
34	systemd/installer.service.in \	systemd/installer.service.in \
35	> systemd/installer.service	> systemd/installer.service
36	$(SED) -e 's:%INSTALLER_INSTALLROOT%:$(INSTALLER_INSTALLROOT):g' \	$(SED) -e 's:%INSTALLER_LIVEROOT%:$(INSTALLER_LIVEROOT):g' \
37		-e 's:%INSTALLER_INSTALLROOT%:$(INSTALLER_INSTALLROOT):g' \
38	-e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \	-e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
39	conf/installer.conf.in \	conf/installer.conf.in \
40	> conf/installer.conf	> conf/installer.conf

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2652   changed lines   Added in v.2653