From a7f43ee21c1112efd32da93f684bdfbfe15cfe57 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 7 Mar 2001 02:25:25 +0000 Subject: reviewed by: Robin * Slomkowski 2001-03-06 Eric Fischer reviewed by: Robin * Slomkowski * nautilus-installer.spec.in: Also include uncompressed, unstripped eazel-installer. * nautilus-installer/src/Makefile.am: Install uncompressed, unstripped eazel-installer rather than discarding it. * nautilus-installer/src/create-eazel-installer.sh: Only strip the copy of the installer that is to be compressed. --- ChangeLog | 14 ++++++++++++++ nautilus-installer.spec.in | 1 + nautilus-installer/src/Makefile.am | 4 ++-- nautilus-installer/src/create-eazel-installer.sh | 5 +++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4060aab0f..db2eb4d9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2001-03-06 Eric Fischer + + reviewed by: Robin * Slomkowski + + * nautilus-installer.spec.in: + Also include uncompressed, unstripped eazel-installer. + + * nautilus-installer/src/Makefile.am: + Install uncompressed, unstripped eazel-installer rather than + discarding it. + + * nautilus-installer/src/create-eazel-installer.sh: + Only strip the copy of the installer that is to be compressed. + 2001-03-06 Pavel Cisler reviewed by: John Harper diff --git a/nautilus-installer.spec.in b/nautilus-installer.spec.in index 529a8bd31..1fcb33a39 100644 --- a/nautilus-installer.spec.in +++ b/nautilus-installer.spec.in @@ -87,3 +87,4 @@ makeflags="-k prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{syscon %defattr(0555, bin, bin) %{prefix}/bin/eazel-installer.sh +%{prefix}/bin/eazel-installer diff --git a/nautilus-installer/src/Makefile.am b/nautilus-installer/src/Makefile.am index ec07c80d7..88db816ab 100644 --- a/nautilus-installer/src/Makefile.am +++ b/nautilus-installer/src/Makefile.am @@ -9,7 +9,7 @@ WARN_FLAG = -Wall -Werror BUILD_DATE = $(shell date +%d%b%y-%H%M) if ENABLE_INSTALLER -INSTALLER_NOINSTPROGRAMS = eazel-installer +INSTALLER_BINPROGRAMS = eazel-installer INSTALLER_BINSCRIPTS = eazel-installer.sh endif @@ -39,7 +39,7 @@ INCLUDES = \ $(NULL) bin_SCRIPTS = $(INSTALLER_BINSCRIPTS) -noinst_PROGRAMS = $(INSTALLER_NOINSTPROGRAMS) +bin_PROGRAMS = $(INSTALLER_BINPROGRAMS) eazel_installer_SOURCES = \ main.c \ diff --git a/nautilus-installer/src/create-eazel-installer.sh b/nautilus-installer/src/create-eazel-installer.sh index 68bb5755c..8e10e9d33 100644 --- a/nautilus-installer/src/create-eazel-installer.sh +++ b/nautilus-installer/src/create-eazel-installer.sh @@ -1,14 +1,15 @@ #!/bin/sh +cp eazel-installer hest + echo $CFLAGS | grep -q "DEBUG" if [ $? != 0 ]; then echo "* Stripping" - strip eazel-installer + strip hest fi echo "* Packing" -cp eazel-installer hest gzexe hest echo "* Patching" -- cgit v1.2.1