Commit e6117472 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'for-2010.11/no-install-strip' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents ed6bdad8 478ea1a1

package/Makefile.autotools.in

+0 −4
Original line number Diff line number Diff line
@@ -66,11 +66,7 @@ $(2)_AUTORECONF ?= NO 
$(2)_AUTORECONF_OPT		?=

$(2)_USE_CONFIG_CACHE           ?= $(if $(BR2_CONFIG_CACHE),YES,NO)

$(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install

ifeq ($(BR2_ENABLE_DEBUG),y)

$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install

else

$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install-strip

endif

$(2)_CLEAN_OPT			?= clean

$(2)_UNINSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) uninstall

$(2)_UNINSTALL_TARGET_OPT	?= DESTDIR=$$(TARGET_DIR)  uninstall

package/argus/argus.mk

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ ARGUS_SOURCE:=argus_$(ARGUS_VERSION).orig.tar.gz 
ARGUS_PATCH:=argus_$(ARGUS_VERSION)-1.diff.gz

ARGUS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/argus/

ARGUS_DEPENDENCIES=libpcap

ARGUS_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) install



define ARGUS_DEBIAN_PATCH_APPLY

	if [ -d $(@D)/debian/patches ]; then \

package/at/at.mk

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ AT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/at 
AT_AUTORECONF = YES

AT_INSTALL_STAGING = NO

AT_INSTALL_TARGET = YES

# no install-strip / install-exec

AT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install



AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex)

package/autoconf/autoconf.mk

+0 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ AUTOCONF_VERSION = 2.65 
AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2

AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf



ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff

AUTOCONF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install

endif



AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \

		    ac_cv_prog_gnu_m4_gnu=no

package/automake/automake.mk

+0 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ AUTOMAKE_VERSION = 1.10 
AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2

AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake



ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff

AUTOMAKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install

endif



AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl



HOST_AUTOMAKE_DEPENDENCIES = host-autoconf