summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-06 17:14:08 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-06 17:14:08 +0000
commit4335125cccf64ea3b59ac353696ef0afcb6d5667 (patch)
tree8f89ee8f937ccc11ba3cfb205629dcd42dc13963
parenta4aea515b085c8c56058167915a7ca83c0adc46b (diff)
Add CP make variable
Originally committed as revision 22240 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile2
-rwxr-xr-xconfigure1
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8a542ea5aa..508e1c89d5 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
$(PROGS): %$(EXESUF): %_g$(EXESUF)
- cp -p $< $@
+ $(CP) $< $@
$(STRIP) $@
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
diff --git a/configure b/configure
index de881b93b2..e85e7c2c5f 100755
--- a/configure
+++ b/configure
@@ -2969,6 +2969,7 @@ YASM=$yasmexe
YASMDEP=$yasmexe
AR=$ar
RANLIB=$ranlib
+CP=cp -p
LN_S=$ln_s
STRIP=$strip
CPPFLAGS=$CPPFLAGS