Changeset 556 for trunk/Makefile.in

Timestamp:

Jul 14, 2020, 1:20:22 PM (4 years ago)

Author:

katerina

Message:

Fix for ticket #445 (portable binary installer)

File:

• trunk/Makefile.in (modified) (3 diffs)

trunk/Makefile.in

@@ -687 +687 @@
 run-light: all
         @echo "Building $(PACKAGE)-$(VERSION).run"; \
-        STAGE=$(PACKAGE)-$(VERSION); \
+        STAGE=$(PACKAGE)-$(VERSION)-run-installer; \
         mkdir $$STAGE; \
         if test x"$$?" != x0; then \
@@ -709 +709 @@
         echo  "cp -p $$temp/* $(sbindir) || exit 1" >> $$STAGE/setup.sh; \
         temp=`echo $(sysconfdir) | sed s,^/,,`; \
-        echo "chown root $$temp/*" >> $$STAGE/setup.sh; \
+        echo "chown -R root $$temp/*" >> $$STAGE/setup.sh; \
         configfile=`echo  @myconffile@ | sed 's%^REQ_FROM_SERVER%%'`; \
-        echo  "test -f $$configfile || cp -p $$temp/* $$configfile" >> $$STAGE/setup.sh; \
-        echo  "./samhain-install.sh --express --verbose install-boot || echo 'Cannot install init script'"    >> $$STAGE/setup.sh; \
+        echo  "cp -pr $$temp/* @sysconfdir@"                           >> $$STAGE/setup.sh; \
+        echo  "./samhain-install.sh --express --verbose install-boot"  >> $$STAGE/setup.sh; \
+        echo  "if [ \$$? -ne 0 ]"                                      >> $$STAGE/setup.sh; \
+        echo  "then"                                                   >> $$STAGE/setup.sh; \
+        echo  "  echo 'Installation finished, but could not install boot-time init scripts'"      >> $$STAGE/setup.sh; \
+        echo  "  exit 2"                                               >> $$STAGE/setup.sh; \
+        echo  "fi"                                                     >> $$STAGE/setup.sh; \
+        echo  "echo 'Installation finished'"                           >> $$STAGE/setup.sh; \
+        echo  "exit 0"                                                 >> $$STAGE/setup.sh; \
         cp $(top_srcdir)/mkinstalldirs $$STAGE/; \
         cp $(top_srcdir)/install-sh $$STAGE/; \
@@ -722 +729 @@
         chmod +x $$STAGE/install-sh; \
         $(top_srcdir)/scripts/makeself/makeself.sh --header $(top_srcdir)/scripts/makeself/makeself-header.sh --nocomp --nomd5 --notemp $$STAGE $(PACKAGE)-$(VERSION).run "$(PACKAGE)_$(VERSION)_self_extracting_installer" ./setup.sh && \
-        rm -r $(PACKAGE)-$(VERSION)
+        rm -r $$STAGE
 
 emerge-prepare: dist