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

diff --git a/CHANGES b/CHANGES
index c38f52758237be2c54ab8cef092786c2dd4ca2e5..1dc88be7b7daca54969073a7a34d2bdfb0163ab4 100644 (file)
--- 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 c048599f819d8d34a44800c9076ba4378be7e83c..3971193c46d5b8d3934539d8d3e91cc1a254017d 100644 (file)
--- 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 71c85b2734b396d01fa6b836f9f46dc87911955b..39c9df6c3559d6a4294ffac791949a9917eeae40 100644 (file)
--- 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 00fa0652f40bf22edc295e6bfacd646f3f97299d..eeca7abb40c57c19ae9450616ab7c5ca2dfe305a 100644 (file)
--- 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 a8830359fba53ea702f46c9766c91e6c61aa7a75..c0fd13a10459c2e6227bf7c66a25659b421372d8 100644 (file)
--- 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 1a9b0be22b9a1673c5c064c349d1a2281fa6ab60..11e6249eebb6782b05333d9b9f76b120e603ab1c 100644 (file)
--- 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 acaed74884fafb6ea6ced874a0d0df215014ca97..b031d71f2966830bd8d40658e674a9182e1df1a7 100644 (file)
--- 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