--- Makefile.in.orig 2016-02-03 13:49:10 UTC
+++ Makefile.in
@@ -338,9 +338,9 @@ ECHO_WHITELIST = if [ -f $(REPRODUCERS_C
#end of exported autoconf copies
# binary names
-javaws := $(shell echo javaws | sed '@program_transform_name@')
+javaws := $(shell echo itweb-javaws | sed '@program_transform_name@')
itweb_settings := $(shell echo itweb-settings | sed '@program_transform_name@')
-policyeditor := $(shell echo policyeditor | sed '@program_transform_name@')
+policyeditor := $(shell echo itweb-policyeditor | sed '@program_transform_name@')
# the launcher needs to know $(bindir) and $(datadir) which can be different at
# make-time from configure-time
@@ -900,10 +900,10 @@ install-exec-local:
@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
- ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/
- ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
- ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
- ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
+ ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/itweb-javaws.png
+ ${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
# all generated manpages are installed in swarm
install-data-local:
@@ -913,12 +913,14 @@ install-data-local:
@ENABLE_DOCS_TRUE@ (cd ${abs_top_builddir}/docs/netx; \
@ENABLE_DOCS_TRUE@ for files in $$(find . -type f); \
@ENABLE_DOCS_TRUE@ do \
-@ENABLE_DOCS_TRUE@ ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
+@ENABLE_DOCS_TRUE@ mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \
+@ENABLE_DOCS_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
@ENABLE_DOCS_TRUE@ done)
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ (cd ${abs_top_builddir}/docs/plugin; \
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ for files in $$(find . -type f); \
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ do \
-@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \
+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ done)
# all generated manpages must be removed one by one
@@ -928,7 +930,7 @@ uninstall-local:
rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
rm -r $(ICONS_DEST_DIR)/javaws.png
- KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 javaws.1 policyeditor.1" ; \
+ KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 itweb-javaws.1 itweb-policyeditor.1" ; \
KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
for file in $$KNOWN_MANS ; do \
for dir in $$KNOWN_DIRS ; do \
@@ -1161,7 +1163,7 @@ stamps/generate-docs.stamp: stamps/netx.
echo "$(PLUGIN_VERSION) docs:
" >> "$$HTML_DOCS_INDEX" ; \
for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \
ID=`echo "$$LANG_ID" | head -c 2` ; \
- ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \
+ ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \
export LANG=$$LANG_ID; \
mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
echo "$$LANG_ID" >> "$$HTML_DOCS_INDEX" ; \
@@ -1203,7 +1205,8 @@ stamps/netx.stamp: netx-source-files.txt
(cd $(NETX_RESOURCE_DIR); \
for files in $$(find . -type f); \
do \
- ${INSTALL_DATA} -D $${files} \
+ mkdir -p `dirname $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}`; \
+ ${INSTALL_DATA} $${files} \
$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
done)
cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
@@ -1233,7 +1236,7 @@ clean-netx:
rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
clean-desktop-files:
- rm -f javaws.desktop
+ rm -f itweb-javaws.desktop
rm -f itweb-settings.desktop
launcher.build/$(javaws): launcher/launchers.in
@@ -1266,7 +1269,7 @@ clean-launchers:
fi
javaws.desktop: javaws.desktop.in
- sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > javaws.desktop
+ sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop
itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \
@@ -1274,7 +1277,7 @@ itweb-settings.desktop: $(srcdir)/itweb-
policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
sed 's#PATH_TO_POLICYEDITOR#$(bindir)/$(policyeditor)#' \
- < $(srcdir)/policyeditor.desktop.in > policyeditor.desktop
+ < $(srcdir)/policyeditor.desktop.in > itweb-policyeditor.desktop
# documentation
@@ -1400,7 +1403,7 @@ stamps/netx-dist-tests-prepare-reproduce
notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
$(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
if [ -n "$$notSrcFiles" ] ; then \
- cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
+ tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
fi ; \
cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
if [ -f $(META_MANIFEST) ]; \
@@ -1465,7 +1468,7 @@ stamps/change-dots-to-paths.stamp: stamp
path="`dirname $$slashed_dir`" ; \
file="`basename $$slashed_dir`.jar" ; \
echo "copying $$dir.jar to $$path as $$file" ; \
- mkdir --parents $$path ; \
+ mkdir -p $$path ; \
cp $$dir".jar" "$$path"/"$$file" ; \
fi ; \
done ; \
@@ -1598,7 +1601,7 @@ $(REPRODUCERS_CLASS_NAMES):
whiteListed=$(RUN_WHITELIST_FILTER); \
cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
class_names= ; \
- for test in `find -type f` ; do \
+ for test in `find . -type f` ; do \
class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
INCLUDE="NO" ; \
@@ -1783,7 +1786,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
$(UNIT_CLASS_NAMES):
cd $(NETX_UNIT_TEST_DIR) ; \
class_names= ; \
- for test in `find -type f` ; do \
+ for test in `find . -type f` ; do \
class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
class_names="$$class_names $$class_name" ; \
@@ -1794,10 +1797,7 @@ stamps/run-netx-unit-tests.stamp: stamps
$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES)
filename=" " ; \
cd $(NETX_UNIT_TEST_SRCDIR) ; \
- for file in `find . -type f \! -iname "*.java"`; do\
- filename=`echo $$file `; \
- cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
- done ; \
+ tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \
cd $(NETX_UNIT_TEST_DIR) ; \
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
CLASSPATH=$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR)) ; \
@@ -2095,9 +2095,7 @@ clean-test-code-coverage-tools-jacoco:
@ENABLE_PLUGIN_TRUE@ $(PLUGIN_TEST_SRCS) ;
@ENABLE_PLUGIN_TRUE@ $(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect/*.class ;
-@ENABLE_PLUGIN_TRUE@ cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
-@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect ;
-@ENABLE_PLUGIN_TRUE@ echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
+@ENABLE_PLUGIN_TRUE@ @echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
@ENABLE_PLUGIN_TRUE@ mkdir -p stamps
@ENABLE_PLUGIN_TRUE@ touch stamps/plugin-tests.stamp