Magellan Linux

Diff of /trunk/installer-simple/Makefile

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2640 by niro, Wed Apr 2 11:23:56 2014 UTC revision 2647 by niro, Wed Jul 2 12:40:16 2014 UTC
# Line 28  all: Line 28  all:
28   $(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g' \   $(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g' \
29   -e 's:%BINDIR%:$(BINDIR):g' \   -e 's:%BINDIR%:$(BINDIR):g' \
30   -e 's:%LOCALE%:$(LOCALE):g' \   -e 's:%LOCALE%:$(LOCALE):g' \
31     -e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
32   systemd/installer.service.in \   systemd/installer.service.in \
33   > systemd/installer.service   > systemd/installer.service
34   $(SED) -e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \   $(SED) -e 's:%INSTALLER_INSTALLROOT%:$(INSTALLER_INSTALLROOT):g' \
35   -e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \   -e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
36   conf/installer.conf.in \   conf/installer.conf.in \
37   > conf/installer.conf   > conf/installer.conf
# Line 58  install-systemd: Line 59  install-systemd:
59   $(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)   $(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)
60   $(INSTALL) -m 0644 systemd/installer.service $(DESTDIR)/$(SYSTEMDUNITDIR)   $(INSTALL) -m 0644 systemd/installer.service $(DESTDIR)/$(SYSTEMDUNITDIR)
61   $(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)/local-fs.target.wants   $(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  
62    
63  install: create-dirs install-files install-systemd install-mo  install: create-dirs install-files install-systemd install-mo
64    

Legend:
Removed from v.2640  
changed lines
  Added in v.2647