/hg/icedtea-web: Add quotes to Docs paths in Makefile.am
jkang at icedtea.classpath.org
jkang at icedtea.classpath.org
Thu Jan 22 18:52:56 UTC 2015
changeset 5bd739d5e4e1 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5bd739d5e4e1
author: Jie Kang <jkang at redhat.com>
date: Thu Jan 22 13:52:23 2015 -0500
Add quotes to Docs paths in Makefile.am
2014-01-22 Jie Kang <jkang at redhat.com>
Add quotes to Docs paths in Makefile.am
* Makefile.am:(install-data-local)(stamps/generate-docs.stamp) paths have
quotes "" around them
diffstat:
ChangeLog | 6 ++++++
Makefile.am | 42 +++++++++++++++++++++---------------------
2 files changed, 27 insertions(+), 21 deletions(-)
diffs (90 lines):
diff -r b6e1270385f4 -r 5bd739d5e4e1 ChangeLog
--- a/ChangeLog Wed Jan 21 11:42:48 2015 -0500
+++ b/ChangeLog Thu Jan 22 13:52:23 2015 -0500
@@ -1,3 +1,9 @@
+2014-01-22 Jie Kang <jkang at redhat.com>
+
+ Add quotes to Docs paths in Makefile.am
+ * Makefile.am:(install-data-local)(stamps/generate-docs.stamp) paths have
+ quotes "" around them
+
2014-01-21 Lukasz Dracz <ldracz at redhat.com>
Change PolicyEditor to use OptionParser
diff -r b6e1270385f4 -r 5bd739d5e4e1 Makefile.am
--- a/Makefile.am Wed Jan 21 11:42:48 2015 -0500
+++ b/Makefile.am Thu Jan 22 13:52:23 2015 -0500
@@ -275,7 +275,7 @@
# all generated manpages are installed in swarm
install-data-local:
${mkinstalldirs} -d $(DESTDIR)$(mandir)
- cp -r $(DOCS_DIR)/man/* $(DESTDIR)$(mandir)/
+ cp -r "$(DOCS_DIR)/man/"* $(DESTDIR)$(mandir)/
if ENABLE_DOCS
${mkinstalldirs} $(DESTDIR)$(htmldir)
(cd ${abs_top_builddir}/docs/netx; \
@@ -495,36 +495,36 @@
endif
stamps/generate-docs.stamp: stamps/netx.stamp
- mkdir -p $(DOCS_DIR) ; \
- HTML_DOCS_TARGET_DIR=$(DOCS_DIR)/html ; \
- PLAIN_DOCS_TARGET_DIR=$(DOCS_DIR)/plain ; \
- MAN_DOCS_TARGET_DIR=$(DOCS_DIR)/man ; \
- mkdir $$HTML_DOCS_TARGET_DIR ; \
- mkdir $$PLAIN_DOCS_TARGET_DIR ; \
- mkdir $$MAN_DOCS_TARGET_DIR ; \
- HTML_DOCS_INDEX=$$HTML_DOCS_TARGET_DIR/index.html ; \
+ mkdir -p "$(DOCS_DIR)" ; \
+ HTML_DOCS_TARGET_DIR="$(DOCS_DIR)/html" ; \
+ PLAIN_DOCS_TARGET_DIR="$(DOCS_DIR)/plain" ; \
+ MAN_DOCS_TARGET_DIR="$(DOCS_DIR)/man" ; \
+ mkdir "$$HTML_DOCS_TARGET_DIR" ; \
+ mkdir "$$PLAIN_DOCS_TARGET_DIR" ; \
+ mkdir "$$MAN_DOCS_TARGET_DIR" ; \
+ HTML_DOCS_INDEX="$$HTML_DOCS_TARGET_DIR/index.html" ; \
TP_COMMAND="$(BOOT_DIR)/bin/java -cp $(NETX_DIR) net.sourceforge.jnlp.util.docprovider.TextsProvider" ; \
TP_TAIL="false $(FULL_VERSION)" ; \
LANG_BACKUP=$$LANG ; \
- echo "<html><head><title>$(PLUGIN_VERSION)</title></head>" > $$HTML_DOCS_INDEX ; \
+ echo "<html><head><title>$(PLUGIN_VERSION)</title></head>" > "$$HTML_DOCS_INDEX" ; \
echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> $$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` ; \
export LANG=$$LANG_ID; \
- mkdir $$HTML_DOCS_TARGET_DIR/$$ID ; \
- echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> $$HTML_DOCS_INDEX ; \
- $$TP_COMMAND html $$HTML_DOCS_TARGET_DIR/$$ID false $$TP_TAIL ; \
- mkdir $$PLAIN_DOCS_TARGET_DIR/$$ID ; \
- $$TP_COMMAND plain $$PLAIN_DOCS_TARGET_DIR/$$ID 160 false $$TP_TAIL; \
+ mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
+ echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \
+ $$TP_COMMAND html "$$HTML_DOCS_TARGET_DIR/$$ID" false "$$TP_TAIL" ; \
+ mkdir "$$PLAIN_DOCS_TARGET_DIR/$$ID" ; \
+ $$TP_COMMAND plain "$$PLAIN_DOCS_TARGET_DIR/$$ID" 160 false "$$TP_TAIL"; \
if [ $$ID == "en" ] ; then \
- MAN_DESC=$$MAN_DOCS_TARGET_DIR/man1 ; \
+ MAN_DESC="$$MAN_DOCS_TARGET_DIR/man1" ; \
else \
- MAN_DESC=$$MAN_DOCS_TARGET_DIR/$$ID/man1 ; \
+ MAN_DESC="$$MAN_DOCS_TARGET_DIR/$$ID/man1" ; \
fi ; \
- mkdir -p $$MAN_DESC ; \
- $$TP_COMMAND man $$ENCOD $$MAN_DESC $$TP_TAIL ; \
- $$TP_COMMAND htmlIntro $(NETX_DIR)/net/sourceforge/jnlp/resources/about_$$ID.html $$TP_TAIL; \
+ mkdir -p "$$MAN_DESC" ; \
+ $$TP_COMMAND man $$ENCOD "$$MAN_DESC" "$$TP_TAIL" ; \
+ $$TP_COMMAND htmlIntro "$(NETX_DIR)/net/sourceforge/jnlp/resources/about_$$ID.html" "$$TP_TAIL"; \
done ; \
export LANG=$$LANG_BACKUP ; \
echo "</body></html>" >> $$HTML_DOCS_INDEX ; \
@@ -672,7 +672,7 @@
rm -f stamps/plugin-docs.stamp
clean-generated-docs:
- rm -rf $(DOCS_DIR)
+ rm -rf "$(DOCS_DIR)"
rm -f stamps/generate-docs.stamp
More information about the distro-pkg-dev
mailing list