From c2f441840ff7cc411928041979c6f44d474e2fa8 Mon Sep 17 00:00:00 2001 From: Winfried Date: Fri, 22 Oct 2010 08:51:38 +0000 Subject: [PATCH] M libopenjpeg/Makefile.in M libopenjpeg/Makefile.am M jp3d/libjp3dvm/Makefile.in M jp3d/libjp3dvm/Makefile.am M CHANGES M jpwl/Makefile.in M jpwl/Makefile.am --- CHANGES | 3 +++ jp3d/libjp3dvm/Makefile.am | 4 ++-- jp3d/libjp3dvm/Makefile.in | 4 ++-- jpwl/Makefile.am | 4 ++-- jpwl/Makefile.in | 4 ++-- libopenjpeg/Makefile.am | 4 ++-- libopenjpeg/Makefile.in | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index c38f5275..1dc88be7 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +October 22, 2010 +* [szukw000] replaced 'cp -d' with 'cp -P' for MacOSX + October 22, 2010 * [szukw000] 'jpwl/Makefile.am': added CFLAGS for bin_PROGRAMS diff --git a/jp3d/libjp3dvm/Makefile.am b/jp3d/libjp3dvm/Makefile.am index c048599f..3971193c 100644 --- a/jp3d/libjp3dvm/Makefile.am +++ b/jp3d/libjp3dvm/Makefile.am @@ -38,11 +38,11 @@ headerdir = openjpeg3d-$(MAJOR).$(MINOR) all-local: @$(INSTALL) -d ../../bin - @cp -d .libs/libopenjp3dvm.* ../../bin + @cp -P .libs/libopenjp3dvm.* ../../bin @rm -f ../../bin/libopenjp3dvm.la* @rm -rf .report_lib @$(INSTALL) -d .report_lib - @cp -d .libs/libopenjp3dvm.* .report_lib + @cp -P .libs/libopenjp3dvm.* .report_lib @rm -f .report_lib/libopenjp3dvm.lai @echo "" > ../.report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt diff --git a/jp3d/libjp3dvm/Makefile.in b/jp3d/libjp3dvm/Makefile.in index 71c85b27..39c9df6c 100644 --- a/jp3d/libjp3dvm/Makefile.in +++ b/jp3d/libjp3dvm/Makefile.in @@ -617,11 +617,11 @@ dos2unix: all-local: @$(INSTALL) -d ../../bin - @cp -d .libs/libopenjp3dvm.* ../../bin + @cp -P .libs/libopenjp3dvm.* ../../bin @rm -f ../../bin/libopenjp3dvm.la* @rm -rf .report_lib @$(INSTALL) -d .report_lib - @cp -d .libs/libopenjp3dvm.* .report_lib + @cp -P .libs/libopenjp3dvm.* .report_lib @rm -f .report_lib/libopenjp3dvm.lai @echo "" > ../.report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am index 00fa0652..eeca7abb 100644 --- a/jpwl/Makefile.am +++ b/jpwl/Makefile.am @@ -82,11 +82,11 @@ REPBIN=$(bin_PROGRAMS) all-local: $(INSTALL) -d ../bin $(INSTALL) $(bin_PROGRAMS) ../bin - cp -d .libs/libopenjpeg_JPWL.* ../bin + cp -P .libs/libopenjpeg_JPWL.* ../bin rm -f ../bin/libopenjpeg_JPWL.la* @rm -rf .report_lib @$(INSTALL) -d .report_lib - @cp -d .libs/libopenjpeg_JPWL.* .report_lib + @cp -P .libs/libopenjpeg_JPWL.* .report_lib @rm -f .report_lib/libopenjpeg_JPWL.lai echo "" > .report.txt @(for f in ${REPBIN} ; do \ diff --git a/jpwl/Makefile.in b/jpwl/Makefile.in index a8830359..c0fd13a1 100644 --- a/jpwl/Makefile.in +++ b/jpwl/Makefile.in @@ -968,11 +968,11 @@ dos2unix: all-local: $(INSTALL) -d ../bin $(INSTALL) $(bin_PROGRAMS) ../bin - cp -d .libs/libopenjpeg_JPWL.* ../bin + cp -P .libs/libopenjpeg_JPWL.* ../bin rm -f ../bin/libopenjpeg_JPWL.la* @rm -rf .report_lib @$(INSTALL) -d .report_lib - @cp -d .libs/libopenjpeg_JPWL.* .report_lib + @cp -P .libs/libopenjpeg_JPWL.* .report_lib @rm -f .report_lib/libopenjpeg_JPWL.lai echo "" > .report.txt @(for f in ${REPBIN} ; do \ diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am index 1a9b0be2..11e6249e 100644 --- a/libopenjpeg/Makefile.am +++ b/libopenjpeg/Makefile.am @@ -46,11 +46,11 @@ headerdir = openjpeg-$(MAJOR).$(MINOR) all-local: @$(INSTALL) -d ../bin - @cp -d .libs/libopenjpeg.* ../bin/ + @cp -P .libs/libopenjpeg.* ../bin/ @rm -f ../bin/libopenjpeg.la* @rm -rf .report_lib @$(INSTALL) -d .report_lib - @cp -d .libs/libopenjpeg.* .report_lib + @cp -P .libs/libopenjpeg.* .report_lib @rm -f .report_lib/libopenjpeg.lai @echo "" > .report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> .report.txt diff --git a/libopenjpeg/Makefile.in b/libopenjpeg/Makefile.in index acaed748..b031d71f 100644 --- a/libopenjpeg/Makefile.in +++ b/libopenjpeg/Makefile.in @@ -619,11 +619,11 @@ dos2unix: all-local: @$(INSTALL) -d ../bin - @cp -d .libs/libopenjpeg.* ../bin/ + @cp -P .libs/libopenjpeg.* ../bin/ @rm -f ../bin/libopenjpeg.la* @rm -rf .report_lib @$(INSTALL) -d .report_lib - @cp -d .libs/libopenjpeg.* .report_lib + @cp -P .libs/libopenjpeg.* .report_lib @rm -f .report_lib/libopenjpeg.lai @echo "" > .report.txt @echo "Installing: ${prefix}/include/${headerdir}/" >> .report.txt