Mercurial > hg > release > icedtea-web-1.7

changeset 1402:bbb78a496f99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Makefile.am: cp -a got extracted -a switch to variable, disabled on win, which may fail on certain combinations ow wndows x cygwin.
author Jiri Vanek <jvanek@redhat.com>
date Tue, 25 Apr 2017 11:45:30 +0200
parents edc9f4d7f576
children a49fe8d981cd
files ChangeLog Makefile.am
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Apr 25 11:42:33 2017 +0200
+++ b/ChangeLog	Tue Apr 25 11:45:30 2017 +0200
@@ -1,3 +1,8 @@
+2017-04-25  Jiri Vanek <jvanek@redhat.com>
+
+	* Makefile.am: cp -a got extracted -a switch to variable, disabled on win,
+	which may fail on certain combinations ow wndows x cygwin.
+
 2017-04-25  Jiri Vanek <jvanek@redhat.com>
 
 	* html-gen.sh: fixed case for some cygwin versions, when changelog
--- a/Makefile.am	Tue Apr 25 11:42:33 2017 +0200
+++ b/Makefile.am	Tue Apr 25 11:45:30 2017 +0200
@@ -20,9 +20,11 @@
 	export TOP_BUILD_DIR := $(shell cygpath -p -m "$(abs_top_builddir)")
 	export TOP_SRC_DIR := $(shell cygpath -p -m "$(abs_top_srcdir)")
 	export prefix := $(shell cygpath -p -m "$(prefix)")
+	export CPA=""
 else
 	export TOP_BUILD_DIR = $(abs_top_builddir)
 	export TOP_SRC_DIR = $(abs_top_srcdir)
+	export CPA="-a"
 endif
 
 export NETX_DIR = $(TOP_BUILD_DIR)/netx.build
@@ -670,9 +672,9 @@
 	   ${INSTALL_DATA} -D $${files} \
 	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
 	 done)
-	cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
+	cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
 	  $(NETX_DIR)/net/sourceforge/jnlp/runtime
-	cp -a build.properties $(NETX_DIR)/net/sourceforge/jnlp/
+	cp $(CPA) build.properties $(NETX_DIR)/net/sourceforge/jnlp/
 	mkdir -p stamps
 	touch $@