From 6f1e5930897f0486f2f0635bc1f510410db527ba Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 Feb 2007 17:10:11 +0000 Subject: [PATCH] Simplify strip parameter for install handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22364 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 5 ----- configure | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index cb973f73be..99fea942b3 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,6 @@ CFLAGS += $(CFLAGS-yes) #CFLAGS += -Wall -# Do not strip the binaries at installation -ifeq ($(STRIPBINARIES),yes) -INSTALLSTRIP = -s -endif - SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ diff --git a/configure b/configure index fefe23c89a..92b327acad 100755 --- a/configure +++ b/configure @@ -2193,13 +2193,13 @@ echores $_named_asm_args # Checking for CFLAGS -_stripbinaries=yes +_install_strip="-s" if test "$_profile" != "" || test "$_debug" != "" ; then CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile" if test "$_cc_major" -ge "3" ; then CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'` fi - _stripbinaries=no + _install_strip= elif test -z "$CFLAGS" ; then if test "$cc_vendor" = "intel" ; then CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer" @@ -7448,7 +7448,7 @@ LDCONFIG = $_ldconfig INSTALL = $_install EXTRA_INC = $_inc_extra OPTFLAGS = $CFLAGS \$(EXTRA_INC) -STRIPBINARIES = $_stripbinaries +INSTALLSTRIP = $_install_strip CHARSET = $_charset HELP_FILE = $_mp_help