[PATCH V2] bug fix: make install help/*.html files once

From: ShaoHe Feng <shaohef@linux.vnet.ibm.com> Now Makefile install help/*.html twice. Fix it. Signed-off-by: ShaoHe Feng <shaohef@linux.vnet.ibm.com> --- ui/pages/help/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am index 61ea209..6b08668 100644 --- a/ui/pages/help/Makefile.am +++ b/ui/pages/help/Makefile.am @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) $(wildcard *.html) +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) DITA_XSL_FILE = dita-help.xsl helpdir = $(datadir)/kimchi/ui/pages/help -- 1.8.4.2

ignore this patch. Aline has sent a patch to fix it. On 02/18/2014 12:54 PM, shaohef@linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef@linux.vnet.ibm.com>
Now Makefile install help/*.html twice. Fix it.
Signed-off-by: ShaoHe Feng <shaohef@linux.vnet.ibm.com> --- ui/pages/help/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am index 61ea209..6b08668 100644 --- a/ui/pages/help/Makefile.am +++ b/ui/pages/help/Makefile.am @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) $(wildcard *.html) +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) DITA_XSL_FILE = dita-help.xsl
helpdir = $(datadir)/kimchi/ui/pages/help
-- Thanks and best regards! Sheldon Feng(冯少合)<shaohef@linux.vnet.ibm.com> IBM Linux Technology Center
participants (2)
-
shaohef@linux.vnet.ibm.com
-
Sheldon