From fe7e9fe36c14ce4981c454d03133a67dfb56c3b0 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Fri, 30 Apr 2021 16:24:52 +0200 Subject: [PATCH] Improve Help installation on windows xca.qhcp and xca.qhp are not needed to be installed --- Makefile | 4 ++-- misc/xca.wxs | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f8930972..ec40f8b2 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ xca$(SUFFIX): $(OBJECTS) do.ui do.doc do.lang do.misc: do.%: mkdir -p $* - $(MAKE) -C $* -f $(TOPDIR)/$*/Makefile VPATH=$(TOPDIR)/$* $* + $(MAKE) -C $* -f $(TOPDIR)/$*/Makefile VPATH=$(TOPDIR)/$* all headers: do.ui commithash.h @@ -166,7 +166,7 @@ xca-portable-$(VERSION): xca$(SUFFIX).signed do.doc do.lang do.misc "$(INSTALL_DIR)/bin/libltdl-7.dll" \ "$(INSTALL_DIR)/bin/libcrypto-1_1-x64.dll" \ "$(TOPDIR)"/misc/*.xca "${TOPDIR}/../sql/"*.dll $@ - cp -a doc/qthelp/* $@/html + cp -a doc/qthelp/*.html doc/qthelp/xca.qhc doc/qthelp/xca.qch $@/html cp $(patsubst %,"$(QTDIR)/translations/qt_%.qm", de es pl pt ru fr sk it ja) \ lang/*.qm $@/i18n sed 's/$$/\r/' < "$(TOPDIR)"/COPYRIGHT > $@/copyright.txt diff --git a/misc/xca.wxs b/misc/xca.wxs index 46c30602..7ac92eda 100644 --- a/misc/xca.wxs +++ b/misc/xca.wxs @@ -244,12 +244,6 @@ - - - - - - @@ -414,8 +408,6 @@ - -