mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2024-12-24 11:54:01 +00:00
Install the mkvmerge GUI guide by default into ${datadir}/mkvtoolnix, e.g. into /usr/share/mkvtoolnix.
This commit is contained in:
parent
ae33cf1763
commit
ada75f1768
20
Makefile.in
20
Makefile.in
@ -87,7 +87,8 @@ LDFLAGS = @LDFLAGS@
|
||||
|
||||
CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
|
||||
CXXFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
|
||||
CXXFLAGS += -DMTX_LOCALE_DIR=\"$(localedir)\"
|
||||
CXXFLAGS += -DMTX_LOCALE_DIR=\"$(localedir)\" \
|
||||
-DMTX_PKG_DATA_DIR=\"$(pkgdatadir)\"
|
||||
|
||||
# Which additional stuff to compile
|
||||
USE_WXWINDOWS = @USE_WXWINDOWS@
|
||||
@ -136,7 +137,7 @@ HTMLHELPBOOKS = mkvmerge-gui-book
|
||||
|
||||
all: $(APPLICATIONS) $(TRANSLATIONS_MOS) $(HTMLHELPBOOKS)
|
||||
|
||||
install: install-programs install-mans install-trans
|
||||
install: install-programs install-mans install-trans install-guide
|
||||
|
||||
install-programs: $(APPLICATIONS)
|
||||
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
||||
@ -152,20 +153,31 @@ install-programs: $(APPLICATIONS)
|
||||
|
||||
install-mans:
|
||||
$(mkinstalldirs) $(DESTDIR)$(man1dir)
|
||||
for i in $(MANPAGES); do \
|
||||
@for i in $(MANPAGES); do \
|
||||
inst=`echo $$i | sed -e 's/^.*\///'`; \
|
||||
echo " $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$inst"; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$inst; \
|
||||
done
|
||||
|
||||
install-trans:
|
||||
for i in $(TRANSLATIONS); do \
|
||||
@for i in $(TRANSLATIONS); do \
|
||||
echo "$(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES"; \
|
||||
$(mkinstalldirs) $(DESTDIR)$(localedir)/$$i/LC_MESSAGES; \
|
||||
echo "$(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo"; \
|
||||
$(INSTALL_DATA) po/$$i.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/mkvtoolnix.mo; \
|
||||
done
|
||||
|
||||
install-guide:
|
||||
$(mkinstalldirs) $(pkgdatadir)
|
||||
@for i in doc/mkvmerge-gui.*; do \
|
||||
echo " $(INSTALL_DATA) $$i $(pkgdatadir)/"; \
|
||||
$(INSTALL_DATA) $$i $(pkgdatadir)/; \
|
||||
done
|
||||
@for i in doc/images/*gif; do \
|
||||
echo " $(INSTALL_DATA) $$i $(pkgdatadir)/"; \
|
||||
$(INSTALL_DATA) $$i $(pkgdatadir)/; \
|
||||
done
|
||||
|
||||
SYSTEM_INCLUDES = $(AVILIB_INCLUDES) \
|
||||
-I. -Ilibrmff -Isrc/merge -Isrc/info -Isrc/common -Isrc/input \
|
||||
-Isrc/output -Isrc/mpegparser
|
||||
|
10
debian/rules
vendored
10
debian/rules
vendored
@ -74,16 +74,6 @@ binary-indep: build install
|
||||
dh_installchangelogs ChangeLog
|
||||
dh_installdocs
|
||||
|
||||
# Install the images belonging the GUI guide.
|
||||
install -d $(INSTPREFIX)/share/doc/mkvtoolnix/doc/images
|
||||
for i in doc/mkvmerge-gui.*; do \
|
||||
install -m 0644 $$i \
|
||||
$(INSTPREFIX)/share/doc/mkvtoolnix/doc/; \
|
||||
done
|
||||
for i in doc/images/*gif; do \
|
||||
install -m 0644 $$i \
|
||||
$(INSTPREFIX)/share/doc/mkvtoolnix/doc/images/; \
|
||||
done
|
||||
# Create HTML files from the man page.
|
||||
for i in doc/mkvmerge.1; do \
|
||||
groff -man -Thtml $$i > $(INSTPREFIX)/share/doc/mkvtoolnix/doc/`basename $$i .1`.html; \
|
||||
|
@ -1181,6 +1181,9 @@ mmg_dialog::on_help(wxCommandEvent &evt) {
|
||||
potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix"));
|
||||
potential_help_paths.push_back(wxT("/usr/local/share/doc/packages/mkvtoolnix"));
|
||||
potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix-" VERSION));
|
||||
// New location
|
||||
potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR));
|
||||
potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR "-" VERSION));
|
||||
#endif
|
||||
if (cfg->Read(wxT("help_path"), &help_path))
|
||||
potential_help_paths.push_back(help_path);
|
||||
|
Loading…
Reference in New Issue
Block a user